linux-handhelds-2.6: update hx4700 defconfig for 2.6.20

diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
index 8914f07..3a0d50e 100644 (file)
--- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
@@ -153,6 +153,10 @@ 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_UDC=y
+CONFIG_HX4700_SERIAL=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
 # CONFIG_MACH_HIMALAYA is not set
@@ -166,17 +170,18 @@ CONFIG_HX4700_LEDS=y
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_MACH_X30 is not set
+# CONFIG_MACH_X50 is not set
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
 # CONFIG_MACH_XSCALE_PALMLD is not set
 # CONFIG_MACH_T3XSCALE is not set
+# CONFIG_MACH_RECON is not set
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
 CONFIG_IWMMXT=y
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
+CONFIG_PXA27x_VOLTAGE=m
+CONFIG_PXA27x_VOLTAGE_MAX158xx=m
 
 #
 # Linux As Bootloader
@@ -386,24 +391,12 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NETFILTER_XTABLES is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_SIP is not set
 # CONFIG_IP_NF_QUEUE is not set
 
 #
@@ -567,6 +560,7 @@ CONFIG_MTD_PARTITIONS=y
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
@@ -909,7 +903,7 @@ CONFIG_KEYBOARD_ATKBD=m
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_GPIO_KEYS=y
-# CONFIG_KEYBOARD_ASIC3 is not set
+CONFIG_KEYBOARD_ASIC3=y
 # CONFIG_KEYBOARD_PXA27x is not set
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
@@ -954,6 +948,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_PXA_COUNT=4
+# CONFIG_SERIAL_PXA_IR is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
@@ -1052,7 +1047,22 @@ CONFIG_I2C_PXA=m
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
+CONFIG_W1=m
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_DS1WM is not set
+
+#
+# 1-wire Slaves
+#
+# 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
 
 #
 # Hardware Monitoring support
@@ -1097,12 +1107,18 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Hardware Monitoring - Battery
+#
 CONFIG_BATTERY_MONITOR=y
+CONFIG_DS2760_BATTERY=m
+CONFIG_ADC_BATTERY=m
+CONFIG_APM_POWER=y
 
 #
 # L3 serial bus support
 #
-CONFIG_L3=m
+# CONFIG_L3 is not set
 
 #
 # SoC drivers
@@ -1115,6 +1131,7 @@ CONFIG_L3=m
 # CONFIG_SOC_HAMCOP is not set
 # CONFIG_HTC_ASIC2 is not set
 CONFIG_HTC_ASIC3=y
+CONFIG_HTC_ASIC3_DS1WM=y
 # CONFIG_SOC_TSC2101 is not set
 # CONFIG_SOC_TSC2200 is not set
 
@@ -1126,7 +1143,8 @@ CONFIG_HTC_ASIC3=y
 # Multimedia Capabilities Port drivers
 #
 # CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
+CONFIG_ADC_ADS7846_SSP=y
+# CONFIG_ADC_AD7877 is not set
 # CONFIG_TIFM_CORE is not set
 
 #
@@ -1145,7 +1163,7 @@ CONFIG_LEDS_ASIC3=y
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y
+# CONFIG_LEDS_TRIGGER_HWTIMER is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_SHARED=y
@@ -1316,6 +1334,11 @@ CONFIG_SND_AK4641=m
 #
 # CONFIG_SOUND_PRIME is not set
 
+#
+# HID Devices
+#
+CONFIG_HID=y
+
 #
 # USB support
 #
@@ -1475,6 +1498,7 @@ CONFIG_USB_PXA27X=y
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_MQ11XX is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -1620,7 +1644,6 @@ CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y