Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / arch / powerpc / sysdev / Kconfig

diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig
index 72fb35b9ebcadfbe50a72cabf66cad08305b6bc1..396582835cb51bf46dc7ac8623ea29b723a5251b 100644 (file)
--- a/arch/powerpc/sysdev/Kconfig
+++ b/arch/powerpc/sysdev/Kconfig
@@ -6,3 +6,9 @@ config PPC4xx_PCI_EXPRESS
        bool
        depends on PCI && 4xx
        default n
+
+config PPC_MSI_BITMAP
+       bool
+       depends on PCI_MSI
+       default y if MPIC
+       default y if FSL_PCI