diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-28 20:03:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 20:03:29 +0100 |
| commit | 60717f7e761ca04925d17e90e556e689ab134cdc (patch) | |
| tree | f0daeeb9e5797a8b492453850f3bb764d94c4584 /drivers/ssb/Makefile | |
| parent | [NETFILTER]: Fix NF_QUEUE_NR() parenthesis (diff) | |
| parent | SSB PCI core driver: use new SPROM data structure (diff) | |
| download | linux-60717f7e761ca04925d17e90e556e689ab134cdc.tar.xz linux-60717f7e761ca04925d17e90e556e689ab134cdc.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ssb/Makefile')
| -rw-r--r-- | drivers/ssb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile index e235144add7c..de94c2eb7a37 100644 --- a/drivers/ssb/Makefile +++ b/drivers/ssb/Makefile @@ -14,6 +14,6 @@ ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o # b43 pci-ssb-bridge driver # Not strictly a part of SSB, but kept here for convenience -ssb-$(CONFIG_SSB_PCIHOST) += b43_pci_bridge.o +ssb-$(CONFIG_SSB_B43_PCI_BRIDGE) += b43_pci_bridge.o obj-$(CONFIG_SSB) += ssb.o |