summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/magician/defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/magician/defconfig')
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig21
1 files changed, 10 insertions, 11 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index 745bba4712..17e35c9512 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh6
-# Mon Jun 11 09:57:32 2007
+# Linux kernel version: 2.6.21-hh7
+# Wed Jun 13 14:53:14 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -182,6 +182,8 @@ CONFIG_MAGICIAN_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_PXA27x=y
@@ -711,6 +713,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
@@ -865,23 +868,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=y
CONFIG_APM_POWER=y
+CONFIG_BATTERY_DS2760=y
+CONFIG_ADC_BATTERY=y
#
# L3 serial bus support