diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-07-26 21:18:21 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-07-26 21:18:21 +0000 |
| commit | 8f31903a953958707e1d00222ce312c0edf69497 (patch) | |
| tree | 067c696a8aaafad515a29a35b8d61fa48d02a014 /target/linux/rdc-2.6/patches/000-rdc_fixes.patch | |
| parent | c43c4da559585d9a0e6d833aff5e4c99d01f1300 (diff) | |
| download | upstream-8f31903a953958707e1d00222ce312c0edf69497.tar.gz upstream-8f31903a953958707e1d00222ce312c0edf69497.tar.bz2 upstream-8f31903a953958707e1d00222ce312c0edf69497.zip | |
Use the new x86 code, thanks sn9 !
SVN-Revision: 8185
Diffstat (limited to 'target/linux/rdc-2.6/patches/000-rdc_fixes.patch')
| -rw-r--r-- | target/linux/rdc-2.6/patches/000-rdc_fixes.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch index 482088c2ef..148fc482b4 100644 --- a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch +++ b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch @@ -822,42 +822,3 @@ diff -urN linux-2.6.19/arch/i386/mach-rdc/led.h linux-2.6.19.new/arch/i386/mach- +#define LED_BLINK_RANDOM (LED_BLINK_CMD|0xffff) + +#endif -diff -urN linux-2.6.21.1/arch/i386/kernel/time.c linux-2.6.21.1.new/arch/i386/kernel/time.c ---- linux-2.6.21.1/arch/i386/kernel/time.c 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1.new/arch/i386/kernel/time.c 2007-05-31 13:43:31.000000000 +0200 -@@ -264,8 +264,16 @@ - /* Duplicate of time_init() below, with hpet_enable part added */ - void __init hpet_time_init(void) - { -+#ifndef CONFIG_X86_RDC - if (!hpet_enable()) - setup_pit_timer(); -+#else -+ struct timespec ts; -+ -+ /* RDC devices do not have CMOS */ -+ ts.tv_sec = 0; -+ ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); -+#endif - time_init_hook(); - } - -@@ -279,6 +287,18 @@ - */ - void __init time_init(void) - { -+#ifndef CONFIG_X86_RDC - tsc_init(); - late_time_init = choose_time_init(); -+#else -+ struct timespec ts; -+ -+ /* RDC devices do not have CMOS */ -+ ts.tv_sec = 0; -+ ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); -+ -+ do_settimeofday(&ts); -+ -+ time_init_hook(); -+#endif - } |