aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
commit1d0c4edda14e0be05362dc7c63de2eb378676a13 (patch)
tree0246c4e2ef7b0a463d75d49bdf1305c60ee48f9d /target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch
parent6cacd1932f77b4026e00e1d170ecca9c1d388867 (diff)
downloadmaster-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.gz
master-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.tar.bz2
master-187ad058-1d0c4edda14e0be05362dc7c63de2eb378676a13.zip
brcm63xx: allow bcm963xx and livebox support at the same time
Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only for the 3.14 until properly tested. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch
index 0258710f0b..878e6262d4 100644
--- a/target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch
@@ -1,14 +1,14 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -14,6 +14,7 @@
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -13,6 +13,7 @@
+ #include <linux/platform_device.h>
#include <linux/ssb/ssb.h>
#include <linux/gpio_keys.h>
- #include <linux/input.h>
+#include <linux/spi/spi.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -967,6 +968,9 @@ int __init board_register_devices(void)
+@@ -225,6 +226,9 @@ int __init board_register_devices(void)
if (board.num_devs)
platform_add_devices(board.devs, board.num_devs);