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-ia64-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-ia64-generic')
| -rw-r--r-- | config-ia64-generic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-ia64-generic b/config-ia64-generic index 1fa386d11..f1fa7056b 100644 --- a/config-ia64-generic +++ b/config-ia64-generic @@ -13,7 +13,7 @@ CONFIG_EFI=y # CONFIG_ITANIUM is not set CONFIG_MCKINLEY=y CONFIG_IA64_GENERIC=y -CONFIG_DMAR=y +CONFIG_INTEL_IOMMU=y # CONFIG_IA64_DIG is not set # CONFIG_IA64_HP_ZX1 is not set # CONFIG_IA64_SGI_SN2 is not set @@ -195,7 +195,7 @@ CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_DMAR_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_RCU_FANOUT=64 |