Merge tag 'v3.16-rc5' into timers/core

[sfrench/cifs-2.6.git] / drivers / net / wireless / b43 / bus.h

diff --git a/drivers/net/wireless/b43/bus.h b/drivers/net/wireless/b43/bus.h
index 184c95659279070f2a64edfa6628f109ded51f22..f3205c6988bc4354a14a5226011f762868253936 100644 (file)
--- a/drivers/net/wireless/b43/bus.h
+++ b/drivers/net/wireless/b43/bus.h
@@ -5,7 +5,9 @@ enum b43_bus_type {
 #ifdef CONFIG_B43_BCMA
        B43_BUS_BCMA,
 #endif
+#ifdef CONFIG_B43_SSB
        B43_BUS_SSB,
+#endif
 };
 
 struct b43_bus_dev {
@@ -52,13 +54,21 @@ struct b43_bus_dev {
 
 static inline bool b43_bus_host_is_pcmcia(struct b43_bus_dev *dev)
 {
+#ifdef CONFIG_B43_SSB
        return (dev->bus_type == B43_BUS_SSB &&
                dev->sdev->bus->bustype == SSB_BUSTYPE_PCMCIA);
+#else
+       return false;
+#endif
 }
 static inline bool b43_bus_host_is_sdio(struct b43_bus_dev *dev)
 {
+#ifdef CONFIG_B43_SSB
        return (dev->bus_type == B43_BUS_SSB &&
                dev->sdev->bus->bustype == SSB_BUSTYPE_SDIO);
+#else
+       return false;
+#endif
 }
 
 struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core);