aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-05 19:19:50 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-05 19:19:50 +0000
commit852f7b37ed345e32db50a7fc82e72929a0e13fdc (patch)
tree37b86bee93b62b1ec74b3a93860185a7908cb32c /target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch
parent7b1ae48645f9b2762137448d76e10fb0d00bdeab (diff)
downloadupstream-852f7b37ed345e32db50a7fc82e72929a0e13fdc.tar.gz
upstream-852f7b37ed345e32db50a7fc82e72929a0e13fdc.tar.bz2
upstream-852f7b37ed345e32db50a7fc82e72929a0e13fdc.zip
brcm47xx: backport patch from kernel 2.6.37
Backport patches from r24162 brcm47xx: reorder patches like they were commitet upstream SVN-Revision: 24266
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;
}