aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2009-03-04 17:12:27 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-04 17:12:27 +0000
commit21813b7cbfbc7d2c5f9b1afad48639acddbd888d (patch)
treec0e48627be6695c78f750a052c7c97cede6e594b /arch/arm/configs
parentfafa12091f483a36186e92bf465948d51d56622a (diff)
config-3d7k-remove-mac80211.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/om_3d7k_defconfig28
1 files changed, 6 insertions, 22 deletions
diff --git a/arch/arm/configs/om_3d7k_defconfig b/arch/arm/configs/om_3d7k_defconfig
index 06c6172a10a..b5996dbe5c7 100644
--- a/arch/arm/configs/om_3d7k_defconfig
+++ b/arch/arm/configs/om_3d7k_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Mon Mar 2 16:20:27 2009
+# Wed Mar 4 15:33:48 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -481,26 +481,7 @@ CONFIG_IP6_NF_IPTABLES=m
# CONFIG_AF_RXRPC is not set
# CONFIG_PHONET is not set
CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_NL80211=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-# CONFIG_LIB80211 is not set
-CONFIG_MAC80211=y
-
-#
-# Rate control algorithm selection
-#
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -1117,12 +1098,15 @@ CONFIG_SND_USB=y
# CONFIG_SND_USB_CAIAQ is not set
CONFIG_SND_SOC=y
CONFIG_SND_S3C24XX_SOC=y
+CONFIG_SND_S3C_I2SV2_SOC=y
+CONFIG_SND_S3C64XX_SOC_I2S=y
+CONFIG_SND_S3C24XX_SOC_OM_3D7K_WM8753=y
# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
# CONFIG_SND_S3C64XX_SOC_SMDK6410_WM8731 is not set
-CONFIG_SND_S3C24XX_SOC_OM_3D7K_WM8753=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_WM8753=y
# CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y