diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-30 20:04:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-30 20:04:05 -0300 |
| commit | 3d59f3d46e196f99205ace6fb358497a55bccb72 (patch) | |
| tree | 5238f0433d513f0319b35c5a0b7af34be998abed /libre-testing/kernel26-libre/config.i686 | |
| parent | d306ce23cc50c1b5110ee9e4cacfbed9b1591525 (diff) | |
| parent | e26adb29beba0e6db3f4eae2d095da120148a198 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Diffstat (limited to 'libre-testing/kernel26-libre/config.i686')
| -rw-r--r-- | libre-testing/kernel26-libre/config.i686 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libre-testing/kernel26-libre/config.i686 b/libre-testing/kernel26-libre/config.i686 index 383f2115f..541db489e 100644 --- a/libre-testing/kernel26-libre/config.i686 +++ b/libre-testing/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.38 Kernel Configuration -# Tue Mar 15 07:55:26 2011 +# Thu Mar 24 10:43:26 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2656,7 +2656,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m @@ -4077,6 +4077,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_3M_PCT=m CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=m CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m |