aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-07-25 14:52:00 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-07-25 14:52:00 +0000
commit22ec767935be9f6d8681fbe155baf7935ce9ce06 (patch)
treef4d47ebfdd09178c198a3da734e4e08b4a69d749 /target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
parent518908b8492da96f6c1bf081dc3aea2f702fcc78 (diff)
downloadmaster-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.tar.gz
master-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.tar.bz2
master-187ad058-22ec767935be9f6d8681fbe155baf7935ce9ce06.zip
brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32845 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
index 45d3686e2a..3d1f5660fa 100644
--- a/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
+++ b/target/linux/brcm47xx/patches-3.3/114-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -24,7 +24,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/time.h>
-@@ -320,6 +322,31 @@ static int bcm47xx_get_invariants(struct
+@@ -166,6 +168,31 @@ static int bcm47xx_get_invariants(struct
return 0;
}
@@ -56,7 +56,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static void __init bcm47xx_register_ssb(void)
{
int err;
-@@ -352,6 +379,10 @@ static void __init bcm47xx_register_ssb(
+@@ -198,6 +225,10 @@ static void __init bcm47xx_register_ssb(
memcpy(&mcore->serial_ports[1], &port, sizeof(port));
}
}