diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 10:43:20 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 10:43:20 -0400 |
| 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 | |||
| 25 | generic-y += mm-arch-hooks.h | 25 | generic-y += mm-arch-hooks.h |
| 26 | generic-y += mman.h | 26 | generic-y += mman.h |
| 27 | generic-y += msgbuf.h | 27 | generic-y += msgbuf.h |
| 28 | generic-y += msi.h | ||
| 28 | generic-y += param.h | 29 | generic-y += param.h |
| 29 | generic-y += parport.h | 30 | generic-y += parport.h |
| 30 | generic-y += pci.h | 31 | 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 | |||
| 25 | If you don't know what to do here, say Y. | 25 | If you don't know what to do here, say Y. |
| 26 | 26 | ||
| 27 | config PCI_MSI_IRQ_DOMAIN | 27 | config PCI_MSI_IRQ_DOMAIN |
| 28 | def_bool ARM || ARM64 || X86 | 28 | def_bool ARC || ARM || ARM64 || X86 |
| 29 | depends on PCI_MSI | 29 | depends on PCI_MSI |
| 30 | select GENERIC_MSI_IRQ_DOMAIN | 30 | select GENERIC_MSI_IRQ_DOMAIN |
| 31 | 31 | ||