summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-20 17:47:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-20 17:47:51 +0000
commit79acea313ac47165c6b3c55224484c4420e06720 (patch)
tree950d6f09297871fe88e564fad6983aef7b2b1f62
parent6e9c45c2c4f8f33aec7cda649c3e0236075a0ced (diff)
parent9c6fe0eb6939836dd5c84e37d93d6c32c31dd27c (diff)
merge of 'b091298f5a7429063b7fc43393d70a224e4a5d99'
and 'b7ecd3fb6f5dac44f9fe8b851242aa671d666c3a'
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index 48b962c86a..ac9b9e36e9 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -167,7 +167,6 @@ CONFIG_MACH_MAGICIAN=y
CONFIG_MAGICIAN_PM=y
CONFIG_MAGICIAN_TS=m
CONFIG_MAGICIAN_LCD=y
-CONFIG_MAGICIAN_DS1WM=m
CONFIG_MAGICIAN_PHONE=m
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
@@ -908,6 +907,7 @@ CONFIG_ADC_ADS7846_SSP=m
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+CONFIG_HTC_PASIC3=y
CONFIG_HTC_EGPIO=y
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
@@ -929,13 +929,15 @@ CONFIG_LEDS_CLASS=y
# LED drivers
#
CONFIG_LEDS_MAGICIAN=y
+CONFIG_LEDS_PASIC3=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+CONFIG_LEDS_TRIGGER_HWTIMER=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y