From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 1 Jun 2009 08:04:56 +0000 (+0000)
Subject: remove old 2.6.24 code
X-Git-Tag: reboot~23347
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c739ce1888fa71b822985a56213f2518a43f3b21;p=oweals%2Fopenwrt.git

remove old 2.6.24 code

SVN-Revision: 16240
---

diff --git a/target/linux/ar7/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c
index 3448fd2626..58e1528570 100644
--- a/target/linux/ar7/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7/files/arch/mips/ar7/setup.c
@@ -25,9 +25,6 @@
 #include <asm/ar7/ar7.h>
 #include <asm/ar7/prom.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
-extern void ar7_time_init(void);
-#endif
 static void ar7_machine_restart(char *command);
 static void ar7_machine_halt(void);
 static void ar7_machine_power_off(void);
@@ -86,9 +83,6 @@ void __init plat_mem_setup(void)
 	_machine_restart = ar7_machine_restart;
 	_machine_halt = ar7_machine_halt;
 	pm_power_off = ar7_machine_power_off;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
-	board_time_init = ar7_time_init;
-#endif
 	panic_timeout = 3;
 
 	io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
diff --git a/target/linux/ar7/files/arch/mips/ar7/time.c b/target/linux/ar7/files/arch/mips/ar7/time.c
index 70f76bb6b0..2188d9a855 100644
--- a/target/linux/ar7/files/arch/mips/ar7/time.c
+++ b/target/linux/ar7/files/arch/mips/ar7/time.c
@@ -22,16 +22,7 @@
 #include <asm/time.h>
 #include <asm/ar7/ar7.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) /* TODO remove when 2.6.24 is stable */
-void __init plat_timer_setup(struct irqaction *irq)
-{
-	setup_irq(7, irq);
-}
-
-void __init ar7_time_init(void)
-#else
 void __init plat_time_init(void)
-#endif
 {
 	mips_hpt_frequency = ar7_cpu_freq() / 2;
 }