summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2007-12-13 14:05:47 +0000
committerCliff Brake <cbrake@bec-systems.com>2007-12-13 14:05:47 +0000
commitf4a7dac492fabd4f30dcad003cdcabdf6684e39e (patch)
tree312e1b5003b9ef65e718b145052d447f2f8e2653 /packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
parentf57931308d556462ea030f151705c7a86ea37efe (diff)
parentcb76f7fa94314d1c9fe1001ddf6ce55d87622ae3 (diff)
merge of '8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99'
and 'a3c2ca2c7bfaba0da5e3b8076463aa98d2cbc7ee'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/htcuniversal/defconfig')
-rw-r--r--packages/linux/linux-handhelds-2.6/htcuniversal/defconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
index 9a9c2451a1..c8ee782d61 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:34 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:52 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -172,6 +172,7 @@ CONFIG_HTCUNIVERSAL_BUTTONS=y
CONFIG_HTCUNIVERSAL_BLUETOOTH=m
CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y
CONFIG_HTCUNIVERSAL_PHONE=m
+# CONFIG_HTCUNIVERSAL_MDOC_G3 is not set
CONFIG_HTCUNIVERSAL_AK4641=m
# CONFIG_MACH_HTCALPINE is not set
# CONFIG_MACH_MAGICIAN is not set
@@ -1243,7 +1244,7 @@ CONFIG_MSDOS_PARTITION=y
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
@@ -1267,7 +1268,7 @@ CONFIG_NLS_CODEPAGE_437=y
# CONFIG_NLS_CODEPAGE_1250 is not set
CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set