diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 18:23:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 21:03:18 -0400 |
| commit | 34f9218fe519cd922889076cc7698bd73bdb9f92 (patch) | |
| tree | 50217145a1dd12d404471d7c32f1093ffdc916b7 /config-x86-generic | |
| parent | 829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff) | |
| download | kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip | |
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet
drivers into vendor subdirectories caused a lot of churn in config-generic, but
hopefully it's a bit cleaner now.
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-x86-generic b/config-x86-generic index 2e4cc0a3b..888577342 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -36,10 +36,10 @@ CONFIG_FB_EFI=y # FIXME: 32bit only? # CONFIG_FB_N411 is not set -CONFIG_DMAR=y +CONFIG_INTEL_IOMMU=y CONFIG_DMAR_BROKEN_GFX_WA=y -CONFIG_DMAR_FLOPPY_WA=y -CONFIG_DMAR_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_SCSI_ADVANSYS=m CONFIG_SECCOMP=y |