diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-17 21:14:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-17 21:14:35 -0700 |
| commit | fe537c0ee86b27fbe0690a7869815da80f492dbd (patch) | |
| tree | 6433cf72942bdee384c9052f5ec27f14a5787ba0 /drivers | |
| parent | c95477090a2ace6d241c184adc3fbfcab9c61ceb (diff) | |
| parent | 107acb23ba763197d390ae9ffd347f3e2a524d39 (diff) | |
| download | linux-fe537c0ee86b27fbe0690a7869815da80f492dbd.tar.bz2 | |
Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ssb/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/ssb/driver_mipscore.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index b4a5e5e9d9fc..d976660cb7f0 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 ab8691a32580..3d3dd32bf3ab 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; |