5 files changed, 15 insertions, 1 deletions

diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
index 51ed599cc894..e970fd9cf769 100644
--- a/arch/mips/bcm47xx/Kconfig
+++ b/arch/mips/bcm47xx/Kconfig
@@ -4,6 +4,7 @@ config BCM47XX_SSB
         bool "SSB Support for Broadcom BCM47XX"
         select SYS_HAS_CPU_BMIPS32_3300
         select SSB
+        select SSB_HOST_SOC
         select SSB_DRIVER_MIPS
         select SSB_DRIVER_EXTIF
         select SSB_EMBEDDED
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index f0d22cdb51cd..149214beeda9 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -80,6 +80,15 @@ config SSB_SDIOHOST
 
           If unsure, say N
 
+config SSB_HOST_SOC
+        bool "Support for SSB bus on SoC"
+        depends on SSB
+        help
+          Host interface for a SSB directly mapped into memory. This is
+          for some Broadcom SoCs from the BCM47xx and BCM53xx lines.
+
+          If unsure, say N
+
 config SSB_SILENT
         bool "No SSB kernel messages"
         depends on SSB && EXPERT
diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile
index 30194c5072f5..64a09681cee0 100644
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -7,7 +7,7 @@ ssb-$(CONFIG_SSB_SPROM)			+= sprom.o
 ssb-$(CONFIG_SSB_PCIHOST)               += pci.o pcihost_wrapper.o
 ssb-$(CONFIG_SSB_PCMCIAHOST)            += pcmcia.o bridge_pcmcia_80211.o
 ssb-$(CONFIG_SSB_SDIOHOST)              += sdio.o
-ssb-y                                   += host_soc.o
+ssb-$(CONFIG_SSB_HOST_SOC)              += host_soc.o
 
 # built-in drivers
 ssb-y                                   += driver_chipcommon.o
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index bea823e824eb..5d1e9a0fc389 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -761,6 +761,7 @@ int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func,
 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
 
+#ifdef CONFIG_SSB_HOST_SOC
 int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,
                             ssb_invariants_func_t get_invariants)
 {
@@ -777,6 +778,7 @@ int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,
 
         return err;
 }
+#endif
 
 int __ssb_driver_register(struct ssb_driver *drv, struct module *owner)
 {
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 0a756c2519e5..15bfd5c7d2d7 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -161,7 +161,9 @@ static inline int ssb_sdio_init(struct ssb_bus *bus)
  * host_soc.c
  **************************************************/
 
+#ifdef CONFIG_SSB_HOST_SOC
 extern const struct ssb_bus_ops ssb_host_soc_ops;
+#endif
 
 /* scan.c */
 extern const char *ssb_core_name(u16 coreid);