diff --git a/[refs] b/[refs]
index 8ea3aabb6bfc..9ab3f524b348 100644
--- 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
index 74fea5c21839..d3e840d643af 100644
--- 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
index 8223f7843498..ab4cb5476472 100644
--- 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"