aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-08-04 20:04:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-08-04 20:04:54 +0000
commit8428ebd8e84d4adef3267fc66c5d94105f79db15 (patch)
tree4c80f88d2fc88cb7f3c7e365eb58e8ad293dc3e3 /package
parent85b858fae67e4659cb990601b13ccc2078c1dffd (diff)
downloadupstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.tar.gz
upstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.tar.bz2
upstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.zip
brcm47xx: update patches
* this adds sflash support for ssb devices * the flash is now a platform device * minor updates SVN-Revision: 27902
Diffstat (limited to 'package')
-rw-r--r--package/broadcom-diag/src/diag.c2
-rw-r--r--package/broadcom-wl/src/glue/wl_glue.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 8e7ffa6cc7..5ff1c278b8 100644
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -1465,7 +1465,7 @@ static int __init diag_init(void)
static struct platform_t *detected;
#ifdef CONFIG_BCM47XX_SSB
- if (bcm47xx_active_bus_type != BCM47XX_BUS_TYPE_SSB) {
+ if (bcm47xx_bus_type != BCM47XX_BUS_TYPE_SSB) {
printk(MODULE_NAME ": bcma bus is not supported.\n");
return -ENODEV;
}
diff --git a/package/broadcom-wl/src/glue/wl_glue.c b/package/broadcom-wl/src/glue/wl_glue.c
index 18e2b3a583..638a65321a 100644
--- a/package/broadcom-wl/src/glue/wl_glue.c
+++ b/package/broadcom-wl/src/glue/wl_glue.c
@@ -274,7 +274,7 @@ static int __init wl_glue_init(void)
* determine the used one from the info set by the
* platform setup code.
*/
- switch (bcm47xx_active_bus_type)
+ switch (bcm47xx_bus_type)
{
#ifdef CONFIG_SSB
case BCM47XX_BUS_TYPE_SSB: