update magicbox target to 2.6.22-rc6, select gcc 4.2.0 as default for this target...

[openwrt-10.03/.git] / target / linux / magicbox-2.6 / files / drivers / ide / ppc / magicbox_ide.c

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 d1f6d68edba1ac6659f7e01f72bd52d4a08dd19c..2e29e8380a768f9cc51b35dc1ce2f55afd5e9118 100644 (file)
--- 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;