From 2b8c18dce11933d059c648bea491d1237f13d858 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 15 Apr 2008 01:42:47 +0000 Subject: [PATCH] fix magicbox_ide on 2.6.24 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10837 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 2e29e8380..2c1532093 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"); -- 2.20.1