From 7f619ecc2b4ec2c8c3cbb6dd25f68d352d6f5a00 Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Fri, 30 Nov 2012 17:35:01 -0600
Subject: [PATCH] --- yaml --- r: 356438 b: refs/heads/master c:
 8998a030098db908a2b20c864d7ec7246db516f8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cf309c9819ef..e08badf5151b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8443cc142d81b722740a98f42cd4deae826311d0
+refs/heads/master: 8998a030098db908a2b20c864d7ec7246db516f8
diff --git a/trunk/arch/powerpc/sysdev/fsl_ifc.c b/trunk/arch/powerpc/sysdev/fsl_ifc.c
index 2a36fd6a9583..d7fc72239144 100644
--- a/trunk/arch/powerpc/sysdev/fsl_ifc.c
+++ b/trunk/arch/powerpc/sysdev/fsl_ifc.c
@@ -63,7 +63,7 @@ int fsl_ifc_find(phys_addr_t addr_base)
 		return -ENODEV;
 
 	for (i = 0; i < ARRAY_SIZE(fsl_ifc_ctrl_dev->regs->cspr_cs); i++) {
-		__be32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr);
+		u32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr);
 		if (cspr & CSPR_V && (cspr & CSPR_BA) ==
 				convert_ifc_address(addr_base))
 			return i;