2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index b4a5e5e9d9..d976660cb7 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -22,7 +22,7 @@ config SSB
 
 config SSB_PCIHOST_POSSIBLE
         bool
-        depends on SSB && PCI
+        depends on SSB && (PCI = y || PCI = SSB)
         default y
 
 config SSB_PCIHOST
@@ -37,7 +37,7 @@ config SSB_PCIHOST
 
 config SSB_PCMCIAHOST_POSSIBLE
         bool
-        depends on SSB && PCMCIA && EXPERIMENTAL
+        depends on SSB && (PCMCIA = y || PCMCIA = SSB) && EXPERIMENTAL
         default y
 
 config SSB_PCMCIAHOST
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index ab8691a325..3d3dd32bf3 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -173,7 +173,7 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
 
 void ssb_mipscore_init(struct ssb_mipscore *mcore)
 {
-        struct ssb_bus *bus = mcore->dev->bus;
+        struct ssb_bus *bus;
         struct ssb_device *dev;
         unsigned long hz, ns;
         unsigned int irq, i;
@@ -183,6 +183,7 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
 
         ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
 
+        bus = mcore->dev->bus;
         hz = ssb_clockspeed(bus);
         if (!hz)
                 hz = 100000000;