summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/htcblueangel
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-06-13 14:56:55 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-06-13 14:56:55 +0000
commit2e342fac91f16406aa8e876993549ba602f4b50a (patch)
treed388e0bc94ebaadaafab7f41a56a60582913341d /packages/linux/linux-handhelds-2.6/htcblueangel
parent7ca07f0d806a575c92608f99f3da2bf0afdf3e5f (diff)
linux-handhelds-2.6: Drop -hh5, add 2.6.21-hh7.
* Changes since -hh6: 1. Synced with power/battery tree 2. ghi270 machine update 3. ts-adc-debounce fix * Also, update configs from defconfigman r281
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/htcblueangel')
-rw-r--r--packages/linux/linux-handhelds-2.6/htcblueangel/defconfig21
1 files changed, 10 insertions, 11 deletions
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
index 138306de72..ef1531fc1a 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
+++ b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh6
-# Mon Jun 11 09:57:35 2007
+# Linux kernel version: 2.6.21-hh7
+# Wed Jun 13 14:53:16 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -189,6 +189,8 @@ CONFIG_MACH_BLUEANGEL_PHONE=m
# CONFIG_MACH_XSCALE_PALMLD is not set
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_RECON is not set
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
@@ -717,6 +719,7 @@ CONFIG_INPUT=y
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
#
# Input Device Drivers
@@ -873,23 +876,19 @@ CONFIG_W1_MASTER_DS1WM=y
# CONFIG_W1_SLAVE_THERM is not set
# CONFIG_W1_SLAVE_SMEM is not set
# CONFIG_W1_SLAVE_DS2433 is not set
-CONFIG_W1_DS2760=y
+CONFIG_W1_SLAVE_DS2760=y
#
# Hardware Monitoring support
#
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
-
-#
-# Hardware Monitoring - external power and batteries
-#
-CONFIG_EXTERNAL_POWER=y
-CONFIG_BATTERY=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=y
-CONFIG_DS2760_BATTERY=y
-# CONFIG_ADC_BATTERY is not set
CONFIG_APM_POWER=y
+CONFIG_BATTERY_DS2760=y
+# CONFIG_ADC_BATTERY is not set
#
# L3 serial bus support