fix magicbox_ide on 2.6.24
authorNicolas Thill <nico@openwrt.org>
Tue, 15 Apr 2008 01:42:47 +0000 (01:42 +0000)
committerNicolas Thill <nico@openwrt.org>
Tue, 15 Apr 2008 01:42:47 +0000 (01:42 +0000)
SVN-Revision: 10837

target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c

index 2e29e83..2c15320 100644 (file)
@@ -100,8 +100,10 @@ static void __init ide_magicbox_register(unsigned long addr,
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
        if (ide_register_hw(&hw, &hwif) != -1)
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        if (ide_register_hw(&hw, 1, &hwif) != -1)
+#else
+       if (ide_register_hw(&hw, NULL, 1, &hwif) != -1)
 #endif
        {
                printk(KERN_NOTICE "magicbox-ide: Registered IDE-CF driver\n");