git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
arch
/
x86
/
configs
/
x86_64_defconfig
diff --git
a/arch/x86/configs/x86_64_defconfig
b/arch/x86/configs/x86_64_defconfig
index
22a0dc8
..
058a35b
100644
(file)
--- a/
arch/x86/configs/x86_64_defconfig
+++ b/
arch/x86/configs/x86_64_defconfig
@@
-67,8
+67,8
@@
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_PCI_MMCONFIG=y
-CONFIG_
DMAR
=y
-# CONFIG_
DMAR
_DEFAULT_ON is not set
+CONFIG_
INTEL_IOMMU
=y
+# CONFIG_
INTEL_IOMMU
_DEFAULT_ON is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCCARD=y
CONFIG_YENTA=y