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 | fbeeb4ae824859df520551345d3aa84854bc0bf5 (patch) | |
| tree | f26466565b39f3fc45ed9890b2a5a639ddf2a021 /target/linux/magicbox/files | |
| parent | c7ed0fbd18a000eccb8a0540b959cdb3c6b20b5e (diff) | |
| download | upstream-fbeeb4ae824859df520551345d3aa84854bc0bf5.tar.gz upstream-fbeeb4ae824859df520551345d3aa84854bc0bf5.tar.bz2 upstream-fbeeb4ae824859df520551345d3aa84854bc0bf5.zip | |
fix magicbox_ide on 2.6.24
SVN-Revision: 10837
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"); |