u8500: defconfig: add merge changes to defconfigs

Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>

2 files changed, 33 insertions, 6 deletions

diff --git a/arch/arm/configs/mop500_defconfig b/arch/arm/configs/mop500_defconfig
index 8c38badb259..6d92972a2b2 100755
--- a/arch/arm/configs/mop500_defconfig
+++ b/arch/arm/configs/mop500_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29-gcov
-# Thu Mar 11 09:02:17 2010
+# Linux kernel version: 2.6.29
+# Fri Apr  9 19:28:48 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -168,11 +168,14 @@ CONFIG_FREEZER=y
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_W90X900 is not set
 CONFIG_ARCH_U8500=y
+CONFIG_PLAT_NOMADIK=y
+CONFIG_NOMADIK_GPIO=y
 CONFIG_UX500_SOC_DB8500=y
 # CONFIG_MACH_U8500_SIMULATOR is not set
 # CONFIG_MACH_U5500_SIMULATOR is not set
 CONFIG_MACH_U8500_MOP=y
 CONFIG_U8500_CPUFREQ=y
+CONFIG_U8500_PM=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT=y
 CONFIG_GPIO_STM=y
@@ -571,9 +574,15 @@ CONFIG_ANDROID_PMEM=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_KERNEL_DEBUGGER_CORE is not set
 # CONFIG_UID_STAT is not set
+# CONFIG_WL127X_RFKILL is not set
 # CONFIG_APANIC is not set
 CONFIG_APANIC_PLABEL="kpanic"
 CONFIG_AB8500=y
+# CONFIG_AB8500_ACCESS_CONFIG1 is not set
+# CONFIG_AB8500_ACCESS_CONFIG2 is not set
+CONFIG_AB8500_ACCESS_CONFIG3=y
+# CONFIG_AB8500_ACCESS_CONFIG4 is not set
+# CONFIG_AB8500_ACCESS_CONFIG5 is not set
 CONFIG_AB8500_GPADC=y
 # CONFIG_C2PORT is not set
 
@@ -657,6 +666,7 @@ CONFIG_USB_NET_CDC_SUBSET=m
 # CONFIG_USB_EPSON2888 is not set
 # CONFIG_USB_KC2190 is not set
 # CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_HSO is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -716,7 +726,6 @@ CONFIG_U8500_TSC=y
 # CONFIG_U8500_TSC_SINGLETOUCH is not set
 CONFIG_U8500_TSC_MULTITOUCH=y
 # CONFIG_U8500_TSC_EXT_CLK_9_6 is not set
-# CONFIG_U8500_TSC_EXT_CLK_SHARE is not set
 CONFIG_TOUCHP_TUNING=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
@@ -729,6 +738,7 @@ CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_KEYCHORD is not set
 
+#
 # Hardware I/O ports
 #
 CONFIG_SERIO=y
@@ -1178,10 +1188,24 @@ CONFIG_U8500_SDIO_CARD_IRQ=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_LP5521=y
+
 #
 # LED drivers
 #
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_PCA955X is not set
+CONFIG_LEDS_LP5521=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+CONFIG_SWITCH=y
 # CONFIG_SWITCH_GPIO is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -1427,6 +1451,7 @@ CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig
index 80de860af41..e83085b2872 100755
--- a/arch/arm/configs/mop500_power_defconfig
+++ b/arch/arm/configs/mop500_power_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29
-# Thu Mar 25 20:11:47 2010
+# Wed Apr 21 10:52:50 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -574,6 +574,7 @@ CONFIG_ANDROID_PMEM=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_KERNEL_DEBUGGER_CORE is not set
 # CONFIG_UID_STAT is not set
+# CONFIG_WL127X_RFKILL is not set
 # CONFIG_APANIC is not set
 CONFIG_APANIC_PLABEL="kpanic"
 CONFIG_AB8500=y
@@ -665,6 +666,7 @@ CONFIG_USB_NET_CDC_SUBSET=m
 # CONFIG_USB_EPSON2888 is not set
 # CONFIG_USB_KC2190 is not set
 # CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_HSO is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -724,7 +726,6 @@ CONFIG_U8500_TSC=y
 # CONFIG_U8500_TSC_SINGLETOUCH is not set
 CONFIG_U8500_TSC_MULTITOUCH=y
 # CONFIG_U8500_TSC_EXT_CLK_9_6 is not set
-# CONFIG_U8500_TSC_EXT_CLK_SHARE is not set
 CONFIG_TOUCHP_TUNING=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATI_REMOTE is not set
@@ -1456,6 +1457,7 @@ CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set