aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-08-19 20:06:24 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-08-19 20:06:24 +0000
commit3ba033ed1b74e693d29491e3ecb432a3461c3245 (patch)
treeccb1a8dbfbba0b5bbd5659d2c8ea994e1018bcf3 /target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
parentfede953fc292ccc63a470a66f2da7e44c02fb94b (diff)
downloadmaster-187ad058-3ba033ed1b74e693d29491e3ecb432a3461c3245.tar.gz
master-187ad058-3ba033ed1b74e693d29491e3ecb432a3461c3245.tar.bz2
master-187ad058-3ba033ed1b74e693d29491e3ecb432a3461c3245.zip
kernel: update bcma to code from v3.17-rc1
This is needed for some new patches. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42221 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
index e4e2163a4f..312f63b370 100644
--- a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
+++ b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
@@ -109,7 +109,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
switch (core->id.id) {
case BCMA_CORE_4706_CHIPCOMMON:
case BCMA_CORE_CHIPCOMMON:
-+ case BCMA_CORE_CHIPCOMMON_B:
++ case BCMA_CORE_NS_CHIPCOMMON_B:
case BCMA_CORE_PCI:
case BCMA_CORE_PCIE:
case BCMA_CORE_PCIE2:
@@ -118,7 +118,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
}
+ /* Init CC core */
-+ core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON_B);
++ core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);
+ if (core) {
+ bus->drv_cc_b.core = core;
+ bcma_core_chipcommon_b_init(&bus->drv_cc_b);
@@ -142,7 +142,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/* Some specific cores don't need wrappers */
switch (core->id.id) {
case BCMA_CORE_4706_MAC_GBIT_COMMON:
-+ case BCMA_CORE_CHIPCOMMON_B:
++ case BCMA_CORE_NS_CHIPCOMMON_B:
/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
break;
default: