aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-07-28 02:02:08 -0300
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 09:00:18 -0600
commitc2eb43f2661714b0a952942a45f2cd6a9c8bc558 (patch)
treeafdcc2e3f0bdab78b10a242ad335585899e7de33
parentbf19638ce9ed3a980552af2a64a43629cdb9690d (diff)
downloadlinux-linaro-c2eb43f2661714b0a952942a45f2cd6a9c8bc558.tar.gz
LINARO: CONFIG: Enabling WL12XX for Omap
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx511
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap1
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv3101
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u85001
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress1
-rw-r--r--debian.linaro/config/config.common.ubuntu7
6 files changed, 11 insertions, 1 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 8c8b2dcc458..c6553f93b9e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -258,6 +258,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
+# CONFIG_WL12XX_MENU is not set
# CONFIG_WLAN is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_USER is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 8d653de7a95..508e7cc156e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -319,6 +319,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_W1=y
CONFIG_WATCHDOG=y
CONFIG_WIRELESS=y
+CONFIG_WL12XX_MENU=m
CONFIG_WLAN=y
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_USER=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index c3d00f02053..fc4e73dba6a 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -229,6 +229,7 @@ CONFIG_VMSPLIT_3G=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
CONFIG_WIRELESS=y
+# CONFIG_WL12XX_MENU is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_USER is not set
CONFIG_ZBOOT_ROM_BSS=0
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 9d81adbf696..1c29f0ff1cf 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -233,6 +233,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
+# CONFIG_WL12XX_MENU is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_USER is not set
CONFIG_ZBOOT_ROM_BSS=0
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 49b2a18d6b7..392fbc904bd 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -296,6 +296,7 @@ CONFIG_VMSPLIT_2G=y
# CONFIG_W1 is not set
# CONFIG_WATCHDOG is not set
# CONFIG_WIRELESS is not set
+# CONFIG_WL12XX_MENU is not set
# CONFIG_WLAN is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_USER is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 5933d49c4b2..530be0bf97e 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2028,7 +2028,12 @@ CONFIG_WEXT_SPY=y
CONFIG_WIRELESS_EXT=y
CONFIG_WIRELESS_EXT_SYSFS=y
# CONFIG_WL1251 is not set
-# CONFIG_WL12XX_MENU is not set
+CONFIG_WL12XX=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WL12XX_SDIO=m
+# CONFIG_WL12XX_SDIO_TEST is not set
+# CONFIG_WL12XX_SPI is not set
# CONFIG_X25 is not set
CONFIG_XFRM=y
# CONFIG_XFRM_STATISTICS is not set