aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-03-18 16:01:18 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-03-18 10:20:17 -0400
commit9205124c66a69664c6825501cb062ebd2acd3b3a (patch)
tree41ecdb8a8c3b22f4df108597cc5d73db054b3171 /arch/powerpc
parent1976152fd8e706135deed6cf333e347c08416056 (diff)
powerpc/5200: Build fix for mpc52xx watchdog timer code
mpc52xx_gpt_wdt_setup is defined as 0, which causes the following build failure with gcc 4.5, since it's built with -Werror. arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect Changing it to a static inline fixes the problem. Reported-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_gpt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 072b948b2e2d..5d7cc88dae6b 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -711,7 +711,11 @@ static int __devinit mpc52xx_gpt_wdt_init(void)
711 return 0; 711 return 0;
712} 712}
713 713
714#define mpc52xx_gpt_wdt_setup(x, y) (0) 714static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
715 const u32 *period)
716{
717 return 0;
718}
715 719
716#endif /* CONFIG_MPC5200_WDT */ 720#endif /* CONFIG_MPC5200_WDT */
717 721