summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-12 16:45:27 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-12 16:45:27 +0000
commit1b56ff89986cdc568437df3847975dcc24ecb3a4 (patch)
tree6b21a427b528711d1f6e6fcf270001cca8bccd63 /target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
parent6d7798dc01d71f5db2a8d468a7cfdc67444ae090 (diff)
brcm47xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch b/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
index 2c41a3008..cba9a6398 100644
--- a/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
+++ b/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
@@ -32,7 +32,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
struct bcma_device_id *match, int core_num,
struct bcma_device *core)
-@@ -407,6 +418,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -392,6 +403,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
bcma_scan_switch_core(bus, erombase);
while (eromptr < eromend) {
@@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
if (!core)
return -ENOMEM;
-@@ -426,6 +438,8 @@ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -411,6 +423,8 @@ int bcma_bus_scan(struct bcma_bus *bus)
core->core_index = core_num++;
bus->nr_cores++;
@@ -58,4 +58,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ u8 core_unit;
u32 addr;
- u32 addr1;
+ u32 wrap;