diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-28 20:58:26 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-28 20:58:26 +0000 |
commit | f2abfe38b5dc02c84d2bac07d63e1286911753f6 (patch) | |
tree | 566653144add4363927101f928a5635720a334f9 /packages/linux/linux-handhelds-2.6/h2200/defconfig | |
parent | f65410694972507145a908832d5aaed6cf9d3662 (diff) | |
parent | 3c860c27f2964122d1e5edb6f680000e5f70c29a (diff) |
merge of 'bca233c54921d697afe0c58539ba0647975eea82'
and 'c3ea902a16ac9537aff32973f0af8e547cc765ba'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/h2200/defconfig')
-rw-r--r-- | packages/linux/linux-handhelds-2.6/h2200/defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 916e42a1c6..067ac2ec98 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh4 -# Fri May 25 06:28:48 2007 +# Linux kernel version: 2.6.21-hh5 +# Mon May 28 20:35:15 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -255,6 +255,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="keepinitrd" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +# CONFIG_TXTOFFSET_DELTA is not set # # CPU Frequency scaling @@ -759,7 +760,6 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set -CONFIG_TOUCHSCREEN_SAMCOP=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set |