port atheros to 2.6.24 (untested), but do not use the new kernel by default yet

[openwrt-10.03/.git] / target / linux / atheros / files / arch / mips / atheros / board.c

diff --git a/target/linux/atheros/files/arch/mips/atheros/board.c b/target/linux/atheros/files/arch/mips/atheros/board.c
index ebb4a5afef716102eacc2cf325fcd4ab404beac3..ccbda48546748cba5a9d3f0ddd8e5edb037207c8 100644 (file)
--- a/target/linux/atheros/files/arch/mips/atheros/board.c
+++ b/target/linux/atheros/files/arch/mips/atheros/board.c
@@ -180,6 +180,7 @@ const char *get_system_type(void)
        return "Atheros (unknown)";
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
 void __init plat_timer_setup(struct irqaction *irq)
 {
        unsigned int count;
@@ -191,6 +192,7 @@ void __init plat_timer_setup(struct irqaction *irq)
        count = read_c0_count();
        write_c0_compare(count + 1000);
 }
+#endif
 
 asmlinkage void plat_irq_dispatch(void)
 {
@@ -198,6 +200,13 @@ asmlinkage void plat_irq_dispatch(void)
        DO_AR5315(ar5315_irq_dispatch();)
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+void (*board_time_init)(void);
+void __init plat_time_init(void) {
+    board_time_init();
+}
+#endif
+
 void __init arch_init_irq(void)
 {
        clear_c0_status(ST0_IM);