From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 15 Apr 2008 01:42:47 +0000 (+0000)
Subject: fix magicbox_ide on 2.6.24
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fbeeb4ae824859df520551345d3aa84854bc0bf5;p=openwrt%2Fstaging%2Fkaloz.git

fix magicbox_ide on 2.6.24

SVN-Revision: 10837
---

diff --git a/target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c b/target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c
index 2e29e8380a..2c15320931 100644
--- a/target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c
+++ b/target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c
@@ -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");