diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-09-08 19:50:53 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-09-08 19:50:53 +0000 |
| commit | 347649a7ee3c358821e84b825292d6198fdc2b12 (patch) | |
| tree | efbd0a4b3cafa6c87a13c660ba85c9149efbf36f /target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch | |
| parent | 6ed55cedbdd519bc568fa202193557d6ea496c0d (diff) | |
| download | upstream-347649a7ee3c358821e84b825292d6198fdc2b12.tar.gz upstream-347649a7ee3c358821e84b825292d6198fdc2b12.tar.bz2 upstream-347649a7ee3c358821e84b825292d6198fdc2b12.zip | |
kernel: add bcma patches sent upstream but not pushed yet
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42448 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.patch | 8 |
1 files changed, 4 insertions, 4 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 c744e3892d..59b94c1170 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 @@ -105,7 +105,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +} --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -164,6 +164,7 @@ static int bcma_register_cores(struct bc +@@ -213,6 +213,7 @@ static int bcma_register_devices(struct switch (core->id.id) { case BCMA_CORE_4706_CHIPCOMMON: case BCMA_CORE_CHIPCOMMON: @@ -113,7 +113,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> case BCMA_CORE_PCI: case BCMA_CORE_PCIE: case BCMA_CORE_PCIE2: -@@ -301,6 +302,13 @@ int bcma_bus_register(struct bcma_bus *b +@@ -327,6 +328,13 @@ int bcma_bus_register(struct bcma_bus *b bcma_core_chipcommon_init(&bus->drv_cc); } @@ -127,7 +127,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /* Init MIPS core */ core = bcma_find_core(bus, BCMA_CORE_MIPS_74K); if (core) { -@@ -355,6 +363,8 @@ void bcma_bus_unregister(struct bcma_bus +@@ -381,6 +389,8 @@ void bcma_bus_unregister(struct bcma_bus else if (err) bcma_err(bus, "Can not unregister GPIO driver: %i\n", err); @@ -148,7 +148,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> default: --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -338,6 +338,7 @@ struct bcma_bus { +@@ -337,6 +337,7 @@ struct bcma_bus { u8 num; struct bcma_drv_cc drv_cc; |