diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 03:01:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 03:01:19 +0300 |
| commit | 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 (patch) | |
| tree | b5492b3191f29f68018c4d76f41f8bab379db0c5 /arch/powerpc/platforms | |
| parent | 9b59a0a4eefa132a3899b6e8d362f92559c67844 (diff) | |
| parent | 9205124c66a69664c6825501cb062ebd2acd3b3a (diff) | |
| download | linux-9d20593a722c2dab7a5ab74f5d8c9b604aca52f9.tar.xz | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: Build fix for mpc52xx watchdog timer code
of: Fix comparison of "compatible" properties
powerpc/52xx: update defconfigs
spi/omap2_mcspi: Use transaction speed if provided
spi/omap2_mcspi: fix NULL pointer dereference
uartlite: Fix build on sparc.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 6 |
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) return 0; } -#define mpc52xx_gpt_wdt_setup(x, y) (0) +static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt, + const u32 *period) +{ + return 0; +} #endif /* CONFIG_MPC5200_WDT */ |