diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-07 08:44:56 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-07 08:44:56 +0000 |
| commit | 94b5af79b4051dceca40fedc440a3348ff987b3b (patch) | |
| tree | f3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch | |
| parent | 0f80ce2088410d9ccb5f3c8070210af67c787ae0 (diff) | |
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch index fb69cc4aa..7153871d2 100644 --- a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch @@ -27,7 +27,7 @@ void plat_irq_dispatch(void) { u32 cause; -@@ -53,3 +63,19 @@ +@@ -53,3 +63,19 @@ void __init arch_init_irq(void) { mips_cpu_irq_init(); } @@ -115,7 +115,7 @@ while (1) cpu_relax(); } -@@ -50,12 +79,13 @@ +@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void) { /* Disable interrupts and watchdog and spin forever */ local_irq_disable(); @@ -131,7 +131,7 @@ { int i = 0; -@@ -72,52 +102,141 @@ +@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d } } @@ -343,7 +343,7 @@ static char nvram_buf[NVRAM_SPACE]; static int cfe_env; -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c /* Probe for NVRAM header */ static void __init early_nvram_init(void) { @@ -362,7 +362,7 @@ +obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -54,6 +54,7 @@ +@@ -54,6 +54,7 @@ config BCM47XX select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF select SSB_DRIVER_PCICORE |