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 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
Kconfig
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index
140e254
..
650bb8c
100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-689,6
+689,7
@@
config AMD_IOMMU
bool "AMD IOMMU support"
select SWIOTLB
select PCI_MSI
bool "AMD IOMMU support"
select SWIOTLB
select PCI_MSI
+ select PCI_IOV
depends on X86_64 && PCI && ACPI
---help---
With this option you can enable support for AMD IOMMU hardware in
depends on X86_64 && PCI && ACPI
---help---
With this option you can enable support for AMD IOMMU hardware in
@@
-1847,7
+1848,7
@@
config APM_ALLOW_INTS
endif # APM
endif # APM
-source "
arch/x86/kernel/cpu
/cpufreq/Kconfig"
+source "
drivers
/cpufreq/Kconfig"
source "drivers/cpuidle/Kconfig"
source "drivers/cpuidle/Kconfig"