mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] upgrade to 2.6.25.7, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
|
||||
arch/mips/bcm963xx/time.c | 29 -----------------------------
|
||||
2 files changed, 0 insertions(+), 31 deletions(-)
|
||||
|
||||
Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
|
||||
+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
|
||||
@@ -465,8 +465,6 @@ void __init plat_mem_setup(void)
|
||||
--- a/arch/mips/bcm963xx/setup.c
|
||||
+++ b/arch/mips/bcm963xx/setup.c
|
||||
@@ -465,8 +465,6 @@
|
||||
_machine_halt = brcm_machine_halt;
|
||||
pm_power_off = brcm_machine_halt;
|
||||
|
||||
@@ -24,11 +22,9 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
|
||||
/* mpi initialization */
|
||||
mpi_init();
|
||||
}
|
||||
Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
|
||||
+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
|
||||
@@ -71,26 +71,6 @@ static inline unsigned long __init cal_r
|
||||
--- a/arch/mips/bcm963xx/time.c
|
||||
+++ b/arch/mips/bcm963xx/time.c
|
||||
@@ -71,26 +71,6 @@
|
||||
return (mips_hpt_frequency / HZ);
|
||||
}
|
||||
|
||||
@@ -55,7 +51,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
|
||||
void __init plat_time_init(void)
|
||||
{
|
||||
unsigned int est_freq, flags;
|
||||
@@ -107,12 +87,3 @@ void __init plat_time_init(void)
|
||||
@@ -107,12 +87,3 @@
|
||||
(est_freq % 1000000) * 100 / 1000000);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user