diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-30 15:53:08 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-30 15:53:08 +0000 |
| commit | 40ccc298bad9750af2ee579288dfd8def3286067 (patch) | |
| tree | 1c10d2dbc4e74510b0bc322185b4ce512519ee44 /target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch | |
| parent | 5df1ac31daa98afea347573820a695cb6c66e914 (diff) | |
kernel: bring ssb in sync with upstream (as of current wireless-testing)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21269 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch index 9e3309307..e6ac4c8e8 100644 --- a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch @@ -345,7 +345,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -739,6 +739,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -733,6 +733,9 @@ static void __cpuinit build_r4000_tlb_re /* No need for uasm_i_nop */ } @@ -355,7 +355,7 @@ #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else -@@ -1193,6 +1196,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1185,6 +1188,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { |