summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/magician/defconfig
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-06-20 18:34:01 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-06-20 18:34:01 +0000
commit7ecaae4deab799c25b1378784673f7bc3985c67f (patch)
treeaccce4d59a208fe5f699aa536a43e09818e25b07 /packages/linux/linux-handhelds-2.6/magician/defconfig
parentf031f04c2bd7ebceeff316c4b0db5a6c5a22a91e (diff)
parent64c2a82c5a282c5505caabc62221fede99083114 (diff)
merge of '0788f41e36cf5b4b88c53ce9aa763d4e9ef4effe'
and '0b1741c2cb8e66a82741314429764b02c98a2b9a'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/magician/defconfig')
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index f0c32c9f91..c7c8c5cb91 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-hh8
-# Mon Jun 18 14:34:20 2007
+# Wed Jun 20 18:24:35 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,7 +166,6 @@ CONFIG_MACH_MAGICIAN=y
CONFIG_MAGICIAN_PM=y
CONFIG_MAGICIAN_TS=m
CONFIG_MAGICIAN_LCD=y
-CONFIG_MAGICIAN_CPLD=y
CONFIG_MAGICIAN_DS1WM=m
CONFIG_MAGICIAN_PHONE=m
# CONFIG_MACH_HTCAPACHE is not set
@@ -907,7 +906,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_EGPIO is not set
+CONFIG_HTC_EGPIO=y
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
# CONFIG_SOC_HAMCOP is not set
@@ -1410,7 +1409,7 @@ CONFIG_MSDOS_PARTITION=y
# Native Language Support
#
CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set