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.x86_64 | |
parent | d306ce23cc50c1b5110ee9e4cacfbed9b1591525 (diff) | |
parent | e26adb29beba0e6db3f4eae2d095da120148a198 (diff) |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Diffstat (limited to 'libre-testing/kernel26-libre/config.x86_64')
-rw-r--r-- | libre-testing/kernel26-libre/config.x86_64 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libre-testing/kernel26-libre/config.x86_64 b/libre-testing/kernel26-libre/config.x86_64 index f95514c81..83184b9ef 100644 --- a/libre-testing/kernel26-libre/config.x86_64 +++ b/libre-testing/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.38 Kernel Configuration -# Tue Mar 15 08:48:05 2011 +# Thu Mar 24 10:23:04 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -335,7 +335,8 @@ CONFIG_DMI=y CONFIG_GART_IOMMU=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y @@ -2506,7 +2507,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 @@ -3852,6 +3853,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 |