[x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211 (Closes: #625510)
svn path=/dists/trunk/linux-2.6/; revision=17296
This commit is contained in:
parent
464404c039
commit
c19d033e38
|
@ -6,6 +6,8 @@ linux-2.6 (2.6.39~rc5-1~experimental.2) UNRELEASED; urgency=low
|
|||
|
||||
[ Ben Hutchings
|
||||
* xhci-hcd: Include <linux/slab.h> in xhci-pci.c (fixes FTBFS on armel)
|
||||
* [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211
|
||||
(Closes: #625510)
|
||||
|
||||
-- maximilian attems <maks@debian.org> Tue, 01 May 2011 14:36:33 +0100
|
||||
|
||||
|
|
|
@ -1079,9 +1079,8 @@ CONFIG_SFI=y
|
|||
## file: drivers/staging/brcm80211/Kconfig
|
||||
##
|
||||
CONFIG_BRCM80211=m
|
||||
## choice: Broadcom IEEE802.11n driver style
|
||||
CONFIG_BRCM80211_PCI=y
|
||||
## end choice
|
||||
CONFIG_BRCMSMAC=y
|
||||
# CONFIG_BRCMFMAC is not set
|
||||
|
||||
##
|
||||
## file: drivers/staging/comedi/Kconfig
|
||||
|
|
Loading…
Reference in New Issue