diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-02-09 10:29:28 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-02-09 10:29:28 +0000 |
commit | 1fd898c4d2c67f89b150c212fcd439728ca97508 (patch) | |
tree | 4f218ef0f6446459af163261d140df7165ab2ba8 /target/linux/adm5120/files/arch | |
parent | b734512859db60d7344c6546e2a3eff2b1dbbdd0 (diff) | |
download | master-187ad058-1fd898c4d2c67f89b150c212fcd439728ca97508.tar.gz master-187ad058-1fd898c4d2c67f89b150c212fcd439728ca97508.tar.bz2 master-187ad058-1fd898c4d2c67f89b150c212fcd439728ca97508.zip |
[adm5120] switch to 2.6.24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/arch')
-rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/reset.c | 2 | ||||
-rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/setup.c | 6 | ||||
-rw-r--r-- | target/linux/adm5120/files/arch/mips/adm5120/time.c | 11 |
3 files changed, 0 insertions, 19 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/reset.c b/target/linux/adm5120/files/arch/mips/adm5120/reset.c index b086f9a5bd..653d42c849 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/reset.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/reset.c @@ -27,7 +27,6 @@ #include <linux/irq.h> #include <linux/io.h> -#include <asm/bootinfo.h> #include <asm/addrspace.h> #include <adm5120_info.h> @@ -50,7 +49,6 @@ void adm5120_halt(void) { local_irq_disable(); - printk(KERN_NOTICE "\n** You can safely turn off the power\n"); while (1) { if (cpu_wait) cpu_wait(); diff --git a/target/linux/adm5120/files/arch/mips/adm5120/setup.c b/target/linux/adm5120/files/arch/mips/adm5120/setup.c index 9046057f9f..418a342e81 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/setup.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/setup.c @@ -23,7 +23,6 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <linux/version.h> #include <asm/reboot.h> #include <asm/time.h> @@ -60,11 +59,6 @@ void __init plat_mem_setup(void) adm5120_mem_init(); adm5120_report(); -#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; pm_power_off = 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 66eb1ce7df..63191d4938 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/time.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/time.c @@ -21,7 +21,6 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/timex.h> -#include <linux/version.h> #include <asm/irq.h> #include <asm/cpu.h> @@ -34,13 +33,3 @@ 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); - - /* Install ISR for CPU Counter interrupt */ - setup_irq(ADM5120_IRQ_COUNTER, irq); -} -#endif |