diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:20 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:20 -0500 |
| commit | 6c6cba49495c3a254c1bc922afeb69e1431d2c23 (patch) | |
| tree | 1be15c312d2ab6713fece384bca3d0f9bf09d284 | |
| parent | 5485e49f71610a005304f8a3617ab2893543a1dc (diff) | |
| parent | f8430eae9f1b439154dbe8bd77d697c4cece145b (diff) | |
Merge branch 'pci/msi' into next
* pci/msi:
PCI/MSI: Enable PCI_MSI_IRQ_DOMAIN support for ARC
| -rw-r--r-- | arch/arc/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | drivers/pci/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild index 0b10ef2a4372..c332604606dd 100644 --- a/arch/arc/include/asm/Kbuild +++ b/arch/arc/include/asm/Kbuild @@ -25,6 +25,7 @@ generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h generic-y += mman.h generic-y += msgbuf.h +generic-y += msi.h generic-y += param.h generic-y += parport.h generic-y += pci.h diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 67f9916ff14d..6555eb78d91c 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -25,7 +25,7 @@ config PCI_MSI If you don't know what to do here, say Y. config PCI_MSI_IRQ_DOMAIN - def_bool ARM || ARM64 || X86 + def_bool ARC || ARM || ARM64 || X86 depends on PCI_MSI select GENERIC_MSI_IRQ_DOMAIN |