Patchwork powerpc: Build fix for mpc52xx

login
register
mail settings
Submitter Jeff Mahoney
Date March 10, 2010, 9:03 p.m.
Message ID <4B980909.7050501@suse.com>
Download mbox | patch
Permalink /patch/47285/
State Superseded
Headers show

Comments

Jeff Mahoney - March 10, 2010, 9:03 p.m.
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

Defining it as do { } while(0) fixes the problem.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -711,7 +711,7 @@  static int __devinit mpc52xx_gpt_wdt_ini
 	return 0;
 }
 
-#define mpc52xx_gpt_wdt_setup(x, y)		(0)
+#define mpc52xx_gpt_wdt_setup(x, y)		do { } while(0)
 
 #endif	/*  CONFIG_MPC5200_WDT	*/