[oe] [meta-handheld][PATCH] linux-gcw0_3.12: update defconfig

[Andrea Adami]

Follow upstream changes.
Add CONFIG_KEXEC=y

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig b/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig
index 70f6f41..44c53bd 100644
--- a/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig
+++ b/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig
@@ -7,6 +7,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_KEXEC=y
 # CONFIG_SECCOMP is not set
 CONFIG_LOCALVERSION="-dingux"
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="gcw-zero"
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ_IDLE=y
@@ -21,10 +22,8 @@ CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
 # CONFIG_IOSCHED_CFQ is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_SUSPEND is not set
@@ -67,8 +66,10 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_JZ_SADC=y
+CONFIG_JOYSTICK_MXC6225=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PWM_HAPTIC=y
 # CONFIG_SERIO is not set
 CONFIG_LEGACY_PTY_COUNT=2
 # CONFIG_DEVMEM is not set
@@ -81,6 +82,7 @@ CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
+CONFIG_PINCTRL_JZ4770=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PMU_ACT8600_SUPPORT=y
@@ -174,7 +176,7 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_INTF_PROC is not set
-CONFIG_RTC_DRV_JZ4770=y
+CONFIG_RTC_DRV_JZ4740=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_JZ4770=y
-- 
1.9.1