diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-04-14 05:08:26 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-04-14 05:08:26 -0400 |
commit | 1fb4e407b520a2344b92a680c75672c7900aedf8 (patch) | |
tree | abe030f4d11d93bc53ed13e7b203fe479e152950 /arch/arm | |
parent | 7c60a6ed10e7d7146fbae52a7f5d59c05169ce4d (diff) |
ARM: ux500: configure for CW1200 WLAN chip
The CW1200 WLAN chip driver had been in the kernel for a while,
we only need to activate it for the Ux500 properly. The latter
require some elaborative work, but in the meantime, let's make
sure we atleast compile it in.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 726b1fa786f7..d219d6a43238 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -34,7 +34,10 @@ CONFIG_IP_PNP=y | |||
34 | CONFIG_IP_PNP_DHCP=y | 34 | CONFIG_IP_PNP_DHCP=y |
35 | CONFIG_NETFILTER=y | 35 | CONFIG_NETFILTER=y |
36 | CONFIG_PHONET=y | 36 | CONFIG_PHONET=y |
37 | # CONFIG_WIRELESS is not set | 37 | CONFIG_CFG80211=y |
38 | CONFIG_CFG80211_DEBUGFS=y | ||
39 | CONFIG_MAC80211=y | ||
40 | CONFIG_MAC80211_LEDS=y | ||
38 | CONFIG_CAIF=y | 41 | CONFIG_CAIF=y |
39 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
40 | CONFIG_DEVTMPFS=y | 43 | CONFIG_DEVTMPFS=y |
@@ -45,7 +48,8 @@ CONFIG_SENSORS_BH1780=y | |||
45 | CONFIG_NETDEVICES=y | 48 | CONFIG_NETDEVICES=y |
46 | CONFIG_SMSC911X=y | 49 | CONFIG_SMSC911X=y |
47 | CONFIG_SMSC_PHY=y | 50 | CONFIG_SMSC_PHY=y |
48 | # CONFIG_WLAN is not set | 51 | CONFIG_CW1200=y |
52 | CONFIG_CW1200_WLAN_SDIO=y | ||
49 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 53 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
50 | CONFIG_INPUT_EVDEV=y | 54 | CONFIG_INPUT_EVDEV=y |
51 | # CONFIG_KEYBOARD_ATKBD is not set | 55 | # CONFIG_KEYBOARD_ATKBD is not set |
@@ -93,7 +97,6 @@ CONFIG_LEDS_CLASS=y | |||
93 | CONFIG_LEDS_LM3530=y | 97 | CONFIG_LEDS_LM3530=y |
94 | CONFIG_LEDS_GPIO=y | 98 | CONFIG_LEDS_GPIO=y |
95 | CONFIG_LEDS_LP5521=y | 99 | CONFIG_LEDS_LP5521=y |
96 | CONFIG_LEDS_TRIGGERS=y | ||
97 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 100 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
98 | CONFIG_RTC_CLASS=y | 101 | CONFIG_RTC_CLASS=y |
99 | CONFIG_RTC_DRV_AB8500=y | 102 | CONFIG_RTC_DRV_AB8500=y |