diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-12-13 22:43:51 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-13 22:43:51 +0000 |
commit | 7adf6ab5dd75cf9b85acddac1e955f4ab72344fb (patch) | |
tree | fa0bb373ec0f83fdfdaded2b2f1d49ac7a6e56d0 /packages/linux/linux-handhelds-2.6/htcuniversal/defconfig | |
parent | ec163abdb68da4938ee7ee153995fc680100a2b5 (diff) | |
parent | 797990ba0f2ebd7b153e54e095d42927642ae27d (diff) |
merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'
and 'f4fae9004af31107f4f7bba2a4fae3dcb11bc1e5'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/htcuniversal/defconfig')
-rw-r--r-- | packages/linux/linux-handhelds-2.6/htcuniversal/defconfig | 9 |
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 |