diff options
| author | Nicolas Thill <nico@openwrt.org> | 2008-04-15 01:42:47 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2008-04-15 01:42:47 +0000 |
| commit | 4c98e3386223d1dfbf76541f81aaa83e09797333 (patch) | |
| tree | 052db5980119ec8f18c255c42b0a610990e7b9ec /target/linux/magicbox/files | |
| parent | 1519a7d78ba2cd3e7950bdf520b2de61eb436f72 (diff) | |
| download | master-187ad058-4c98e3386223d1dfbf76541f81aaa83e09797333.tar.gz master-187ad058-4c98e3386223d1dfbf76541f81aaa83e09797333.tar.bz2 master-187ad058-4c98e3386223d1dfbf76541f81aaa83e09797333.zip | |
fix magicbox_ide on 2.6.24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10837 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/magicbox/files')
| -rw-r--r-- | target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c | 4 |
1 files changed, 3 insertions, 1 deletions
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"); |