diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-28 20:42:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-28 20:42:21 +0000 |
| commit | d922f4e821da4bb7372232e04db3228331048dc9 (patch) | |
| tree | 2fa2024bd91df901352596c72160385d53345319 /target/linux/magicbox-2.6/files | |
| parent | 8df096ed3e5f09cc3e6fce803e1f58347d21a8b2 (diff) | |
| download | master-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.tar.gz master-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.tar.bz2 master-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.zip | |
update magicbox target to 2.6.22-rc6, select gcc 4.2.0 as default for this target (4.1.2 segfaults at compile time)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7762 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/magicbox-2.6/files')
| -rw-r--r-- | target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c b/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c index d1f6d68edb..2e29e8380a 100644 --- a/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c +++ b/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c @@ -4,6 +4,7 @@ * GNU General Public License. */ +#include <linux/version.h> #include <linux/types.h> #include <linux/mm.h> #include <linux/interrupt.h> @@ -97,7 +98,11 @@ static void __init ide_magicbox_register(unsigned long addr, memset(&hw, 0, sizeof(hw)); ide_setup_ports(&hw, addr, ide_offsets, caddr + 12, 0, NULL,irq); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) if (ide_register_hw(&hw, &hwif) != -1) +#else + if (ide_register_hw(&hw, 1, &hwif) != -1) +#endif { printk(KERN_NOTICE "magicbox-ide: Registered IDE-CF driver\n"); hwif->mmio = 2; |