1 files changed, 13 insertions, 19 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 21bad62db17..6d5a1b1b282 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -10,8 +10,8 @@ CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
+CONFIG_PROFILING=y
 CONFIG_BOOTTIME=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -26,17 +26,17 @@ CONFIG_MACH_SNOWBALL=y
 CONFIG_MACH_U8500_SNOWBALL=y
 CONFIG_MACH_UX500_DT=y
 CONFIG_DBX500_PRCMU_DEBUG=y
-CONFIG_DB8500_MLOADER=y
-CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
-CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
-CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
-CONFIG_DISPLAY_AV8100_TERTIARY=y
-CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
 CONFIG_UX500_SUSPEND=y
 CONFIG_UX500_SUSPEND_STANDBY=y
 CONFIG_UX500_SUSPEND_MEM=y
 CONFIG_UX500_SUSPEND_DBG=y
 CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
+CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
+CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
+CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
+CONFIG_DISPLAY_AV8100_TERTIARY=y
+CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
+CONFIG_DB8500_MLOADER=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -55,8 +55,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_IDLE=y
-CONFIG_U8500_CPUIDLE_DEEPEST_STATE=2
-CONFIG_UX500_CPUIDLE_DEBUG=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -126,17 +124,14 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_TUN=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_HSI=m
+CONFIG_SMSC911X=y
+CONFIG_SMSC_PHY=y
 CONFIG_PPP=y
-CONFIG_PPP_ASYNC=y
 CONFIG_PPP_MPPE=y
+CONFIG_PPP_ASYNC=y
+# CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
@@ -226,7 +221,6 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_FILE_STORAGE=m
@@ -256,8 +250,6 @@ CONFIG_DMADEVICES=y
 CONFIG_STE_DMA40=y
 CONFIG_STAGING=y
 CONFIG_AB5500_SIM=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
-CONFIG_HSEM_U8500=y
 CONFIG_CG2900=y
 CONFIG_CG2900_CHIP=y
 CONFIG_STLC2690_CHIP=y
@@ -265,12 +257,14 @@ CONFIG_CG2900_UART=y
 CONFIG_CG2900_AUDIO=y
 CONFIG_CG2900_TEST=y
 CONFIG_BT_CG2900=y
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 CONFIG_CW1200=m
 CONFIG_CW1200_USE_GPIO_IRQ=y
 CONFIG_CW1200_DEBUGFS=y
 CONFIG_U8500_MMIO=y
 CONFIG_U8500_CM=y
 CONFIG_U8500_FLASH=y
+CONFIG_HSEM_U8500=y
 CONFIG_MODEM=y
 CONFIG_MODEM_U8500=y
 CONFIG_U8500_SHRM=y