diff options
| author | David S. Miller <[email protected]> | 2010-02-10 20:35:24 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2010-02-10 20:35:24 +0000 |
| commit | 044c18c9f51a2b92b310e28bb121e55451b088dd (patch) | |
| tree | b57fb7cd9dc33412d6811b734664e90be26418c7 /drivers/ssb/main.c | |
| parent | via-velocity: Fix races on shared interrupts (diff) | |
| parent | rtl8187: Add new device ID (diff) | |
| download | kernel-044c18c9f51a2b92b310e28bb121e55451b088dd.tar.gz kernel-044c18c9f51a2b92b310e28bb121e55451b088dd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ssb/main.c')
| -rw-r--r-- | drivers/ssb/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 5681ebed9c65..03dfd27c4bfb 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -494,8 +494,7 @@ static int ssb_devices_register(struct ssb_bus *bus) #endif break; case SSB_BUSTYPE_SDIO: -#ifdef CONFIG_SSB_SDIO - sdev->irq = bus->host_sdio->dev.irq; +#ifdef CONFIG_SSB_SDIOHOST dev->parent = &bus->host_sdio->dev; #endif break; |