---

yaml --- r: 370807 b: refs/heads/master c: a486bdb h: refs/heads/master i: 370805: 39db135 370803: ca9319d 370799: 3e5faec v: v3
git-mirror · Apr 26, 2013 · 7f34331 · 7f34331
1 parent a502b1a
commit 7f34331
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa0c033f99d9c32a8dd6b1e07d41caf1fced0e1a
+refs/heads/master: a486bdb0e9da8d876d6ff4efc3138d35e141c0b5
diff --git a/trunk/arch/powerpc/platforms/powernv/Kconfig b/trunk/arch/powerpc/platforms/powernv/Kconfig
@@ -8,6 +8,11 @@ config PPC_POWERNV
 	select PPC_PCI_CHOICE if EMBEDDED
 	default y
 
+config POWERNV_MSI
+	bool "Support PCI MSI on PowerNV platform"
+	depends on PCI_MSI
+	default y
+
 config PPC_POWERNV_RTAS
 	depends on PPC_POWERNV
 	bool "Support for RTAS based PowerNV platforms such as BML"

diff --git a/trunk/arch/powerpc/sysdev/Kconfig b/trunk/arch/powerpc/sysdev/Kconfig
@@ -19,7 +19,7 @@ config PPC_MSI_BITMAP
 	default y if MPIC
 	default y if FSL_PCI
 	default y if PPC4xx_MSI
-	default y if PPC_POWERNV
+	default y if POWERNV_MSI
 
 source "arch/powerpc/sysdev/xics/Kconfig"