summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-05 19:19:50 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-05 19:19:50 +0000
commit2308d83efb10f97b03a12808b56f08ae4d7540a5 (patch)
tree7e40103c70b144be9d1f55eb543c3396b92ae737 /target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
parent2c5bea6134b3f2a601323b48c4d6c58ced2cf727 (diff)
brcm47xx: backport patch from kernel 2.6.37
Backport patches from r24162 brcm47xx: reorder patches like they were commitet upstream git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
index afaea44c70..981bf29f50 100644
--- a/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
@@ -33,7 +33,7 @@
+EXPORT_SYMBOL(nvram_get);
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
-@@ -238,3 +238,20 @@ void __init plat_mem_setup(void)
+@@ -215,3 +215,20 @@ void __init plat_mem_setup(void)
_machine_halt = bcm47xx_machine_halt;
pm_power_off = bcm47xx_machine_halt;
}