diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /drivers/ide/legacy/macide.c | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'drivers/ide/legacy/macide.c')
| -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) | |||
| 95 | int irq; | 95 | int irq; |
| 96 | hw_regs_t hw; | 96 | hw_regs_t hw; |
| 97 | 97 | ||
| 98 | if (!MACH_IS_MAC) | ||
| 99 | return -ENODEV; | ||
| 100 | |||
| 98 | switch (macintosh_config->ide_type) { | 101 | switch (macintosh_config->ide_type) { |
| 99 | case MAC_IDE_QUADRA: | 102 | case MAC_IDE_QUADRA: |
| 100 | base = IDE_BASE; | 103 | base = IDE_BASE; |