summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorBartosz Markowski <bartosz.markowski@tieto.com>2011-09-01 09:37:01 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:05:58 +0200
commit6945c50ab4dd8ee783fbeb666b7e23603b9752be (patch)
treea7f280a291a6a950a49eb1d1872839c05df4d10f /drivers/staging
parente4d266cedfb88901b108c57466a130bd0a527f71 (diff)
WLAN: Disable cw1200 driver from kernel tree
cw1200 openMAC driver is taken from compat-wireless drivers/staging folder untill mainlined. ST-Ericsson ID: 352334 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Change-Id: I2378b4a961e0ca711eb3d2afebcf92f8679f81f1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30006
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d9ca441d053..d0613183985 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -174,7 +174,7 @@ source "drivers/staging/nvec/Kconfig"
source "drivers/staging/cg2900/Kconfig"
-source "drivers/staging/cw1200/Kconfig"
+#source "drivers/staging/cw1200/Kconfig"
source "drivers/staging/mmio/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 052526edb3b..f0c74179c09 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -72,7 +72,7 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/
obj-$(CONFIG_DRM_PSB) += gma500/
obj-$(CONFIG_INTEL_MEI) += mei/
obj-$(CONFIG_MFD_NVEC) += nvec/
-obj-$(CONFIG_CW1200) += cw1200/
+#obj-$(CONFIG_CW1200) += cw1200/
obj-$(CONFIG_U8500_MMIO) += mmio/
obj-$(CONFIG_U8500_FLASH) += camera_flash/
obj-$(CONFIG_U8500_CM) += nmf-cm/