summaryrefslogtreecommitdiff
path: root/arch/arm/configs/u8500_android_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/configs/u8500_android_defconfig')
-rw-r--r--arch/arm/configs/u8500_android_defconfig13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig
index 9b7fd3d6660..cc75eb7f10b 100644
--- a/arch/arm/configs/u8500_android_defconfig
+++ b/arch/arm/configs/u8500_android_defconfig
@@ -79,6 +79,7 @@ CONFIG_IPV6=y
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
# CONFIG_INET6_XFRM_MODE_BEET is not set
# CONFIG_IPV6_SIT is not set
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_QUEUE=y
CONFIG_NETFILTER_NETLINK_LOG=y
@@ -120,7 +121,7 @@ CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
CONFIG_DISPDEV=y
CONFIG_U8500_SIM_DETECT=y
-CONFIG_STM_TRACE=y
+# CONFIG_STM_TRACE is not set
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_MD=y
@@ -143,14 +144,8 @@ CONFIG_PPP_MPPE=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_STMPE=y
-CONFIG_KEYBOARD_TC3589X=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_BU21013=y
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=y
-CONFIG_TOUCHSCREEN_CYTTSP_SPI=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AB8500_ACCDET=y
CONFIG_INPUT_AB8500_PONKEY=y
@@ -178,11 +173,12 @@ CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
CONFIG_U8500_WATCHDOG_DEBUG=y
CONFIG_TPS6105X=y
-CONFIG_MFD_STMPE=y
+# CONFIG_MFD_STMPE is not set
CONFIG_MFD_TC3589X=y
CONFIG_AB5500_CORE=y
CONFIG_AB8500_CORE=y
CONFIG_MFD_DB8500_PRCMU=y
+CONFIG_REGULATOR=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_AB8500=y
@@ -191,6 +187,7 @@ CONFIG_REGULATOR_AB8500_DEBUG=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_RADIO_CG2900=y
CONFIG_USB_VIDEO_CLASS=y
CONFIG_RADIO_CG2900=y
CONFIG_DRM=y