aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xarch/arm/configs/u8500_defconfig40
1 files changed, 27 insertions, 13 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 0b768a6dc59..af3e7073968 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.7
-# Mon Feb 28 10:44:30 2011
+# Thu Apr 21 18:58:32 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -286,6 +286,7 @@ CONFIG_TEE_UX500=y
CONFIG_TEE_SVP=y
CONFIG_DB8500_MLOADER=y
CONFIG_UX500_DEBUG_HWREG=y
+# CONFIG_UX500_DEBUG_NO_LAUTERBACH is not set
CONFIG_GPIO_STM=y
# CONFIG_U8500_SECURE is not set
@@ -769,24 +770,25 @@ CONFIG_BT_HCIUART=y
CONFIG_BT_CG2900=y
# CONFIG_AF_RXRPC is not set
CONFIG_WIRELESS=y
+# CONFIG_COMPAT_WIRELESS is not set
CONFIG_CFG80211=m
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_MAC80211_RC_PID is not set
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
# CONFIG_CFG80211_WEXT is not set
# CONFIG_LIB80211 is not set
CONFIG_MAC80211=m
CONFIG_MAC80211_HAS_RC=y
-# CONFIG_MAC80211_RC_PID is not set
-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_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_WIMAX is not set
@@ -794,7 +796,8 @@ CONFIG_RFKILL=y
CONFIG_RFKILL_PM=y
CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=y
+# CONFIG_NET_9P_DEBUG is not set
# CONFIG_CAIF is not set
#
@@ -814,6 +817,7 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_SYS_SOC=y
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
@@ -848,11 +852,14 @@ CONFIG_SENSORS_BH1780=y
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
CONFIG_UID_STAT=y
+# CONFIG_IFACE_STAT is not set
# CONFIG_WL127X_RFKILL is not set
# CONFIG_APANIC is not set
CONFIG_STE_TRACE_MODEM=y
CONFIG_HWMEM=y
CONFIG_DBX500_MLOADER=y
+CONFIG_STM_TRACE=y
+CONFIG_DISPDEV=y
# CONFIG_C2PORT is not set
#
@@ -864,10 +871,8 @@ CONFIG_DBX500_MLOADER=y
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_IWMC3200TOP is not set
-CONFIG_STM_TRACE=y
CONFIG_STM_I2S=y
CONFIG_STM_MSP_I2S=y
-CONFIG_STM_I2S_TEST_PROTOCOL_DRIVER=y
CONFIG_U8500_SHRM=y
# CONFIG_SHRM_ED_V1_VERSION is not set
CONFIG_SHRM_V1_UPDATES_VERSION=y
@@ -1191,6 +1196,7 @@ CONFIG_SPI_PL022=y
#
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
#
# PPS support
@@ -2116,7 +2122,16 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=y
#
# Partition Types
@@ -2411,4 +2426,3 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
-CONFIG_DISPDEV=y