summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-10-06 10:12:38 +0200
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-06 10:12:38 +0200
commit271364eda73463db40900c4bdcee20564e506686 (patch)
treef1390c2ef4fa0535eaba25442e20edcf09bb5aa5
parentc2df11fdab62400e29a3267683c7bca74508c7c2 (diff)
staging: Add cw1200 to makefile and config again
Change-Id: I4706831e0781d806afc1e52bbbad59d4feaa3034 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
-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 22a70c47ac1..fefbc57c7cc 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -172,7 +172,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 40003a5e8ae..464a2ac324c 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -71,7 +71,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/