diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-17 12:57:04 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-17 12:57:04 +0000 |
commit | ad91de86f521b239a749b9ab5de7d2eb45e9fd8b (patch) | |
tree | e74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch | |
parent | 9ebfa7d89a9d13c38cc8f46f361dfadb87cafbb4 (diff) |
[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
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch index ce75ba8e8..9d08ab087 100644 --- a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch +++ b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch @@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> arch/mips/bcm963xx/time.c | 64 ++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 35 deletions(-) -Index: linux-2.6.25.4/arch/mips/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/Kconfig -+++ linux-2.6.25.4/arch/mips/Kconfig -@@ -67,6 +67,8 @@ config BCM963XX +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -67,6 +67,8 @@ select HW_HAS_PCI select DMA_NONCOHERENT select IRQ_CPU @@ -25,10 +23,8 @@ Index: linux-2.6.25.4/arch/mips/Kconfig help This is a fmaily of boards based on the Broadcom MIPS32 -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 +--- a/arch/mips/bcm963xx/time.c ++++ b/arch/mips/bcm963xx/time.c @@ -1,6 +1,7 @@ /* <:copyright-gpl |