From 043588c090462f300434c41caae79b2dacdc959d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 13 Jul 2012 16:24:26 +0000
Subject: [PATCH] --- yaml --- r: 326351 b: refs/heads/master c:
 a99cc82bd61baefd8bb3110e1284629be3610c0c h: refs/heads/master i:   326349:
 7b36fa2325909bc3e079e514ee1976e064009d2e   326347:
 38d931f54126928d3b6b704502e20455716b7da1   326343:
 b448fe0bc71e8b72b3947d502829efe9408f9438   326335:
 e9de2701e6e55295a6a999e0c1f3b275bfd02ab2 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/sysdev/fsl_msi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cb585e8cb936..3be4369156bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c06e6769a89ae6fe7a2eb429224fa30cacdccdb1
+refs/heads/master: a99cc82bd61baefd8bb3110e1284629be3610c0c
diff --git a/trunk/arch/powerpc/sysdev/fsl_msi.c b/trunk/arch/powerpc/sysdev/fsl_msi.c
index a40acd68444e..51ffafae561e 100644
--- a/trunk/arch/powerpc/sysdev/fsl_msi.c
+++ b/trunk/arch/powerpc/sysdev/fsl_msi.c
@@ -502,15 +502,15 @@ static const struct fsl_msi_feature vmpic_msi_feature = {
 static const struct of_device_id fsl_of_msi_ids[] = {
 	{
 		.compatible = "fsl,mpic-msi",
-		.data = (void *)&mpic_msi_feature,
+		.data = &mpic_msi_feature,
 	},
 	{
 		.compatible = "fsl,ipic-msi",
-		.data = (void *)&ipic_msi_feature,
+		.data = &ipic_msi_feature,
 	},
 	{
 		.compatible = "fsl,vmpic-msi",
-		.data = (void *)&vmpic_msi_feature,
+		.data = &vmpic_msi_feature,
 	},
 	{}
 };