summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-06-13 17:31:37 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-06-13 17:31:37 +0000
commit49fc40335631daf60d2ead73ca6e346d52b0f305 (patch)
treef5bd9553945ef5bc014068a389707376b96c5e4b /packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
parent3ddc7888534e1c11c5a64b67aa2276f1baa57811 (diff)
parenta28b3ce0ceda1bb468005d0950cb2f9b453ac68b (diff)
merge of 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
and 'dfe282821bb00a1e4097acfcf4e97e3d5169bdc4'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/htcwallaby/defconfig')
-rw-r--r--packages/linux/linux-handhelds-2.6/htcwallaby/defconfig18
1 files changed, 10 insertions, 8 deletions
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
index 7d67d90052..1f299f1110 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
+++ b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh6
-# Mon Jun 11 09:57:39 2007
+# Linux kernel version: 2.6.21-hh7
+# Wed Jun 13 14:53:20 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -247,6 +247,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_SA1110=y
#
# Floating point emulation
@@ -678,6 +679,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
@@ -790,12 +792,12 @@ CONFIG_LEGACY_PTY_COUNT=32
#
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
-
-#
-# Hardware Monitoring - external power and batteries
-#
-# CONFIG_EXTERNAL_POWER is not set
-# CONFIG_BATTERY is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=y
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_ADC_BATTERY is not set
#
# L3 serial bus support