merge of 'a4c123e0e153d70e8abbfebd4ae1f8275c9fb4a1'

     and 'cd09ce621aa0ddff8436a7dc27250ade56d36571'

1 files changed, 26 insertions, 12 deletions

diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
index 3a0d50e096..49111f9b48 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
@@ -148,15 +148,14 @@ CONFIG_ARCH_PXA=y
 CONFIG_MACH_H4700=y
 CONFIG_HX4700_NAVPOINT=y
 CONFIG_HX4700_CORE=y
-CONFIG_HX4700_TS=y
+# CONFIG_HX4700_TS is not set
 CONFIG_HX4700_BLUETOOTH=y
 CONFIG_HX4700_PCMCIA=y
 CONFIG_HX4700_LCD=y
 CONFIG_HX4700_LEDS=y
-CONFIG_HX4700_BATTERY=m
-CONFIG_HX4700_POWER=y
+CONFIG_HX4700_BATTERY=y
+# CONFIG_HX4700_POWER is not set
 CONFIG_HX4700_UDC=y
-CONFIG_HX4700_SERIAL=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
 # CONFIG_MACH_HIMALAYA is not set
@@ -167,6 +166,7 @@ CONFIG_HX4700_SERIAL=y
 # CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_MACH_HTCBEETLES is not set
 # CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_MACH_X30 is not set
@@ -911,7 +911,20 @@ CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_NAVPOINT=y
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+# CONFIG_TOUCHSCREEN_WM9712 is not set
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
+CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
 
@@ -951,6 +964,7 @@ CONFIG_SERIAL_PXA_COUNT=4
 # CONFIG_SERIAL_PXA_IR is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_RS232_SERIAL=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 
@@ -1047,14 +1061,14 @@ CONFIG_I2C_PXA=m
 #
 # Dallas's 1-wire bus
 #
-CONFIG_W1=m
+CONFIG_W1=y
 
 #
 # 1-wire Bus Masters
 #
 # CONFIG_W1_MASTER_DS2490 is not set
 # CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_DS1WM is not set
+CONFIG_W1_DS1WM=y
 
 #
 # 1-wire Slaves
@@ -1062,7 +1076,7 @@ CONFIG_W1=m
 # CONFIG_W1_SLAVE_THERM is not set
 # CONFIG_W1_SLAVE_SMEM is not set
 # CONFIG_W1_SLAVE_DS2433 is not set
-CONFIG_W1_DS2760=m
+CONFIG_W1_DS2760=y
 
 #
 # Hardware Monitoring support
@@ -1111,8 +1125,8 @@ CONFIG_HWMON=y
 # Hardware Monitoring - Battery
 #
 CONFIG_BATTERY_MONITOR=y
-CONFIG_DS2760_BATTERY=m
-CONFIG_ADC_BATTERY=m
+CONFIG_DS2760_BATTERY=y
+CONFIG_ADC_BATTERY=y
 CONFIG_APM_POWER=y
 
 #
@@ -1143,6 +1157,7 @@ CONFIG_HTC_ASIC3_DS1WM=y
 # Multimedia Capabilities Port drivers
 #
 # CONFIG_MCP is not set
+CONFIG_ADC=y
 CONFIG_ADC_ADS7846_SSP=y
 # CONFIG_ADC_AD7877 is not set
 # CONFIG_TIFM_CORE is not set
@@ -1163,7 +1178,7 @@ CONFIG_LEDS_ASIC3=y
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+CONFIG_LEDS_TRIGGER_HWTIMER=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_SHARED=y
@@ -1398,7 +1413,6 @@ CONFIG_USB_STORAGE=m
 # USB Input Devices
 #
 CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y