From 13ac16c77f791167b60e4b5d8e36033ec0c7ead3 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Jan 2008 15:25:48 +0000
Subject: [adm5120] add preliminary support for 2.6.24

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10329 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/adm5120/files/arch/mips/adm5120/setup.c | 6 +++++-
 target/linux/adm5120/files/arch/mips/adm5120/time.c  | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'target/linux/adm5120/files/arch/mips')

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/setup.c b/target/linux/adm5120/files/arch/mips/adm5120/setup.c
index ca509859b..9046057f9 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/setup.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/setup.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/version.h>
 
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -59,7 +60,10 @@ void __init plat_mem_setup(void)
 	adm5120_mem_init();
 	adm5120_report();
 
-	board_time_init = adm5120_time_init;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+extern void plat_time_init(void) __init;
+	board_time_init = plat_time_init;
+#endif
 
 	_machine_restart = adm5120_restart;
 	_machine_halt = adm5120_halt;
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/time.c b/target/linux/adm5120/files/arch/mips/adm5120/time.c
index b36cea647..66eb1ce7d 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/time.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/time.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/timex.h>
+#include <linux/version.h>
 
 #include <asm/irq.h>
 #include <asm/cpu.h>
@@ -29,11 +30,12 @@
 #include <adm5120_info.h>
 #include <adm5120_irq.h>
 
-void __init adm5120_time_init(void)
+void __init plat_time_init(void)
 {
 	mips_hpt_frequency = adm5120_speed / 2;
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
 void __init plat_timer_setup(struct irqaction *irq)
 {
 	clear_c0_status(ST0_BEV);
@@ -41,3 +43,4 @@ void __init plat_timer_setup(struct irqaction *irq)
 	/* Install ISR for CPU Counter interrupt */
 	setup_irq(ADM5120_IRQ_COUNTER, irq);
 }
+#endif
-- 
cgit v1.2.3