aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-06-01 08:04:56 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-06-01 08:04:56 +0000
commitf1367c62618ccc03a3638e08c60cc8c2cd35f772 (patch)
tree26f8f224dc26f9be6381251dbd157515fd811980 /target/linux/ar7
parentf691eb4f140b85c321c5cf75ee345be832e2d3ec (diff)
downloadupstream-f1367c62618ccc03a3638e08c60cc8c2cd35f772.tar.gz
upstream-f1367c62618ccc03a3638e08c60cc8c2cd35f772.tar.bz2
upstream-f1367c62618ccc03a3638e08c60cc8c2cd35f772.zip
[ar7] remove old 2.6.24 code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/files/arch/mips/ar7/setup.c6
-rw-r--r--target/linux/ar7/files/arch/mips/ar7/time.c9
2 files changed, 0 insertions, 15 deletions
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;
}