浏览代码

Merge branch 'pci/msi' into next

* pci/msi:
  PCI/MSI: Enable PCI_MSI_IRQ_DOMAIN support for ARC
Bjorn Helgaas 8 年之前
父节点
当前提交
6c6cba4949
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      arch/arc/include/asm/Kbuild
  2. 1 1
      drivers/pci/Kconfig

+ 1 - 0
arch/arc/include/asm/Kbuild

@@ -25,6 +25,7 @@ generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
 generic-y += mm-arch-hooks.h
 generic-y += mman.h
 generic-y += mman.h
 generic-y += msgbuf.h
 generic-y += msgbuf.h
+generic-y += msi.h
 generic-y += param.h
 generic-y += param.h
 generic-y += parport.h
 generic-y += parport.h
 generic-y += pci.h
 generic-y += pci.h

+ 1 - 1
drivers/pci/Kconfig

@@ -25,7 +25,7 @@ config PCI_MSI
 	   If you don't know what to do here, say Y.
 	   If you don't know what to do here, say Y.
 
 
 config PCI_MSI_IRQ_DOMAIN
 config PCI_MSI_IRQ_DOMAIN
-	def_bool ARM || ARM64 || X86
+	def_bool ARC || ARM || ARM64 || X86
 	depends on PCI_MSI
 	depends on PCI_MSI
 	select GENERIC_MSI_IRQ_DOMAIN
 	select GENERIC_MSI_IRQ_DOMAIN