X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fbroadcom-wl%2Fsrc%2Fglue%2Fwl_glue.c;h=64f84868b676a15d5358021f317bb7f2acd4e4ba;hb=9e39e08a1b499d21bb1a23a567883042fc5243f1;hp=fc94ac0b25bc2eec10af3c64df2ee07f327673fb;hpb=f1b4824c865b228039d84b2605b2e7e4f34cddeb;p=openwrt-github%2F.git

diff --git a/package/kernel/broadcom-wl/src/glue/wl_glue.c b/package/kernel/broadcom-wl/src/glue/wl_glue.c
index fc94ac0b25..64f84868b6 100644
--- a/package/kernel/broadcom-wl/src/glue/wl_glue.c
+++ b/package/kernel/broadcom-wl/src/glue/wl_glue.c
@@ -74,7 +74,7 @@ static void wl_glue_ssb_remove(struct ssb_device *dev)
 
 static const struct ssb_device_id wl_glue_ssb_tbl[] = {
 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, SSB_ANY_REV),
-	SSB_DEVTABLE_END
+	{},
 };
 
 static struct ssb_driver wl_glue_ssb_driver = {
@@ -132,7 +132,7 @@ static void wl_glue_bcma_remove(struct bcma_device *dev)
 
 static const struct bcma_device_id wl_glue_bcma_tbl[] = {
 	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, BCMA_ANY_REV, BCMA_ANY_CLASS),
-	BCMA_CORETABLE_END
+	{},
 };
 
 static struct bcma_driver wl_glue_bcma_driver = {
@@ -268,17 +268,17 @@ static int __init wl_glue_init(void)
 	 */
 	switch (bcm47xx_bus_type)
 	{
-#ifdef CONFIG_SSB
+#ifdef CONFIG_BCM47XX_SSB
 	case BCM47XX_BUS_TYPE_SSB:
 		active_bus_type = WL_GLUE_BUS_TYPE_SSB;
 		break;
-#endif /* CONFIG_SSB */
+#endif /* CONFIG_BCM47XX_SSB */
 
-#ifdef CONFIG_BCMA
+#ifdef CONFIG_BCM47XX_BCMA
 	case BCM47XX_BUS_TYPE_BCMA:
 		active_bus_type = WL_GLUE_BUS_TYPE_BCMA;
 		break;
-#endif /* CONFIG_BCMA */
+#endif /* CONFIG_BCM47XX_BCMA */
 	}
 #endif /* CONFIG_BCM47XX */