From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 01:46:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
X-Git-Tag: next-20121008~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04e6f5aae4f781081ccd28012d5a38385e4ccfc8;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
---

04e6f5aae4f781081ccd28012d5a38385e4ccfc8
diff --cc arch/powerpc/include/asm/Kbuild
index ace53dbde2cd,13d6b7bf3b69..276797397130
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@@ -34,6 -34,6 +34,7 @@@ header-y += termios.
  header-y += types.h
  header-y += ucontext.h
  header-y += unistd.h
+ header-y += epapr_hcalls.h
  
 +generic-y += clkdev.h
  generic-y += rwsem.h
diff --cc arch/powerpc/sysdev/fsl_msi.c
index 51ffafae561e,7e2b2f2e3ecd..63c5f04ea580
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@@ -506,12 -509,14 +509,14 @@@ static const struct of_device_id fsl_of
  	},
  	{
  		.compatible = "fsl,ipic-msi",
 -		.data = (void *)&ipic_msi_feature,
 +		.data = &ipic_msi_feature,
  	},
+ #ifdef CONFIG_EPAPR_PARAVIRT
  	{
  		.compatible = "fsl,vmpic-msi",
 -		.data = (void *)&vmpic_msi_feature,
 +		.data = &vmpic_msi_feature,
  	},
+ #endif
  	{}
  };