diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
| commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
| tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/kernel26/config | |
| parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
| parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
| download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/kernel26/config')
| -rw-r--r-- | abs/core/kernel26/config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config index da92112..97bcfc9 100644 --- a/abs/core/kernel26/config +++ b/abs/core/kernel26/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39.4 Kernel Configuration -# Wed Aug 17 01:29:19 2011 +# Linux/i386 2.6.39 Kernel Configuration +# Fri Oct 7 04:30:52 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2511,7 +2511,7 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # |