Merge branch 'linus' into x86/pebs

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 1f527bbf8d96..2e84290d0bcc 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -78,6 +78,8 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
 
         hw->irq = irq;
         hw->ack_intr = ack_intr;
+
+        hw->chipset = ide_generic;
 }
 
 static const char *mac_ide_name[] =
@@ -95,6 +97,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;