diff options
| author | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /drivers/ide/legacy | |
| parent | [POWERPC] Remove unnecessary cast in arch_deref_entry_point() (diff) | |
| parent | [POWERPC] iSeries: Remove unused mail address (diff) | |
| download | kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.xz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'drivers/ide/legacy')
| -rw-r--r-- | drivers/ide/legacy/macide.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index 1f527bbf8d96..caa2632dd08e 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c @@ -95,6 +95,9 @@ static int __init macide_init(void) int irq; hw_regs_t hw; + if (!MACH_IS_MAC) + return -ENODEV; + switch (macintosh_config->ide_type) { case MAC_IDE_QUADRA: base = IDE_BASE; |