From c19d033e382357ec5678f6b22446108f4f35bb74 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 4 May 2011 01:52:44 +0000 Subject: [PATCH] [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211 (Closes: #625510) svn path=/dists/trunk/linux-2.6/; revision=17296 --- debian/changelog | 2 ++ debian/config/kernelarch-x86/config | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index df85409a9..6a3520a87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ linux-2.6 (2.6.39~rc5-1~experimental.2) UNRELEASED; urgency=low [ Ben Hutchings * xhci-hcd: Include in xhci-pci.c (fixes FTBFS on armel) + * [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211 + (Closes: #625510) -- maximilian attems Tue, 01 May 2011 14:36:33 +0100 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index bbd8b0166..a22e3b1be 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -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