From c636b3268f6e760d1d6d6bab01deb3d588b018b7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 19 Jan 2014 19:20:02 +0000
Subject: [PATCH] [x86] brcm80211: Enable BRCMFMAC as module, and BRCMFMAC_SDIO
 (Closes: #735245)

svn path=/dists/sid/linux/; revision=20981
---
 debian/changelog                    | 2 ++
 debian/config/kernelarch-x86/config | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e70519792..16ae2481d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ linux (3.12.8-1) UNRELEASED; urgency=low
     as it would cause an ABI change
   * media: Enable VIDEO_STK1160_COMMON (new dependency of VIDEO_STK1160)
     as module (Closes: #735870)
+  * [x86] brcm80211: Enable BRCMFMAC as module, and BRCMFMAC_SDIO
+    (Closes: #735245)
 
   [ Ian Campbell ]
   * [armel/kirkwood] Fix interrupt handling on non-DT platforms (Closes: #735172)
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 044c10d61..b5ffe52ab 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1075,6 +1075,14 @@ CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_USB_ZD1201=m
 
+##
+## file: drivers/net/wireless/brcm80211/Kconfig
+##
+CONFIG_BRCMFMAC=m
+#. Sony Vaio laptops
+CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_USB is not set
+
 ##
 ## file: drivers/net/wireless/mwifiex/Kconfig
 ##