diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
| commit | b6aef2fa31eefccec41172ba32ece5326c729291 (patch) | |
| tree | 7a6e6efcc20c45c379f244ea388dda5e1a0c2334 /libre/kernel26-libre-lts/config.x86_64 | |
| parent | dccab1509d2289e66edf699d1f90d127648fdeeb (diff) | |
| parent | 13bf0e2a4ebb6c8b591b204f4c2e3c8e73e6fe18 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Conflicts:
libre/kernel26-libre-lts/PKGBUILD
libre/kernel26-libre-lts/config.x86_64
Diffstat (limited to 'libre/kernel26-libre-lts/config.x86_64')
| -rw-r--r-- | libre/kernel26-libre-lts/config.x86_64 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 494bb3eff..30cc5aefa 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Mar 21 12:20:44 2011 +# Mon Apr 18 14:25:56 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2188,9 +2188,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_TOUCHSCREEN_WM9705 is not set -# CONFIG_TOUCHSCREEN_WM9712 is not set -# CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y @@ -2204,10 +2204,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_TOUCHSCREEN_USB_JASTEC=y -# CONFIG_TOUCHSCREEN_USB_E2I is not set +CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_PCAP is not set +CONFIG_TOUCHSCREEN_PCAP=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m @@ -4270,7 +4270,7 @@ CONFIG_DLM=m # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 |