1 files changed, 21 insertions, 9 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig
index 71cb1932811..ff7f2289e1c 100644
--- a/arch/arm/configs/u8500_android_defconfig
+++ b/arch/arm/configs/u8500_android_defconfig
@@ -30,8 +30,12 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 CONFIG_MACH_HREFV60=y
+CONFIG_MACH_U8520=y
 CONFIG_MACH_SNOWBALL=y
+CONFIG_MACH_U9540=y
+CONFIG_UX500_GPIO_KEYS=y
 CONFIG_DBX500_PRCMU_DEBUG=y
+CONFIG_DB8500_PWR_TEST=y
 # CONFIG_UX500_USECASE_GOVERNOR is not set
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
 CONFIG_DB8500_MLOADER=y
@@ -78,12 +82,16 @@ 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_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CT_NETLINK=y
+CONFIG_NETFILTER_TPROXY=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
@@ -91,17 +99,16 @@ CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_ULOG=y
 CONFIG_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP6_NF_IPTABLES=y
 CONFIG_PHONET=y
 CONFIG_NET_SCHED=y
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=y
-CONFIG_BT_HCIUART=y
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y
 CONFIG_CFG80211_REG_DEBUG=y
@@ -124,6 +131,7 @@ CONFIG_STE_TRACE_MODEM=y
 CONFIG_DISPDEV=y
 CONFIG_U8500_SIM_DETECT=y
 CONFIG_STM_TRACE=y
+CONFIG_STM_DEFAULT_MASTERS_MODES=0x20
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_MD=y
@@ -144,11 +152,10 @@ CONFIG_PPP_ASYNC=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_STMPE=y
+CONFIG_KEYBOARD_NOMADIK_SKE=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
@@ -174,19 +181,20 @@ CONFIG_GPIO_AB8500=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_AB8500_BM=y
 CONFIG_SENSORS_AB8500=y
+CONFIG_SENSORS_DBX500=y
 CONFIG_SENSORS_LSM303DLH=y
 CONFIG_SENSORS_LSM303DLHC=y
 CONFIG_SENSORS_L3G4200D=y
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
-CONFIG_U8500_WATCHDOG_DEBUG=y
-CONFIG_TPS6105X=y
-CONFIG_MFD_STMPE=y
+CONFIG_UX500_WATCHDOG_DEBUG=y
 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_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
@@ -217,6 +225,7 @@ CONFIG_SND_SOC_UX500_AB5500=y
 CONFIG_SND_SOC_UX500_AB8500=y
 CONFIG_SND_SOC_UX500_CG29XX=y
 CONFIG_SND_SOC_UX500_AV8100=y
+CONFIG_HIDRAW=y
 CONFIG_USB=y
 # CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_SUSPEND=y
@@ -233,7 +242,7 @@ CONFIG_USB_G_ANDROID=y
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_CLKGATE=y
+CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
@@ -273,6 +282,7 @@ CONFIG_CW1200_DEBUGFS=y
 CONFIG_U8500_MMIO=y
 CONFIG_U8500_CM=y
 CONFIG_U8500_FLASH=y
+CONFIG_HSEM_U8500=y
 CONFIG_MODEM_U8500=y
 CONFIG_U8500_SHRM=y
 CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
@@ -310,6 +320,8 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y