summaryrefslogtreecommitdiff
path: root/target/linux/magicbox-2.6/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-28 20:42:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-28 20:42:21 +0000
commit1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9 (patch)
tree9d4f9902345dcb842da67213e184f100aa5a2f06 /target/linux/magicbox-2.6/files
parent83a487c4123bbc1a8da408648e5a567da52b6d6f (diff)
downloadmtk-20170518-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.zip
mtk-20170518-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.tar.gz
mtk-20170518-1b4fc61eea3e3525f3de43e4bcc2aeece9bad0d9.tar.bz2
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)
SVN-Revision: 7762
Diffstat (limited to 'target/linux/magicbox-2.6/files')
-rw-r--r--target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c5
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 d1f6d68..2e29e83 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;