diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-12 10:36:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-12 10:36:03 -0700 |
| commit | 71ac3d19388ecb71e0a83c2e07c3b79154edbe6a (patch) | |
| tree | 2a60c1360acba961d388aaf2cd4f602f98655233 /drivers | |
| parent | ccaa8be8868bdc836f23c029fa7f9f817e3ca648 (diff) | |
| parent | 8412da757776727796e9edd64ba94814cc08d536 (diff) | |
| download | linux-71ac3d19388ecb71e0a83c2e07c3b79154edbe6a.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A build fix and a reboot quirk"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/reboot: Add reboot quirk for Dell Latitude E5410
x86, build, pci: Fix PCI_MSI build on !SMP
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index fe302e33f72e..c880ebaf1553 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -52,7 +52,7 @@ config AMD_IOMMU select PCI_PRI select PCI_PASID select IOMMU_API - depends on X86_64 && PCI && ACPI && X86_IO_APIC + depends on X86_64 && PCI && ACPI ---help--- With this option you can enable support for AMD IOMMU hardware in your system. An IOMMU is a hardware component which provides |