aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/mpc52xx.h
diff options
context:
space:
mode:
authorAlbrecht Dreß <albrecht.dress@arcor.de>2009-11-13 11:09:31 -0700
committerGrant Likely <grant.likely@secretlab.ca>2009-11-13 11:09:31 -0700
commiteda43d16ef3d0bd59e3b762de3ffc73bab02efe9 (patch)
treeb183892818f6106e59e480ba31faf055127e15d7 /arch/powerpc/include/asm/mpc52xx.h
parentmpc52xx/wdt: OF property to enable the WDT on boot (diff)
downloadlinux-dev-eda43d16ef3d0bd59e3b762de3ffc73bab02efe9.tar.xz
linux-dev-eda43d16ef3d0bd59e3b762de3ffc73bab02efe9.zip
mpc52xx/wdt: merge WDT code into the GPT driver
Merge the WDT code into the GPT interface. Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to '')
-rw-r--r--arch/powerpc/include/asm/mpc52xx.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h
index 933fb8f6e797..b664ce79a172 100644
--- a/arch/powerpc/include/asm/mpc52xx.h
+++ b/arch/powerpc/include/asm/mpc52xx.h
@@ -281,7 +281,8 @@ struct mpc52xx_gpt_priv;
extern struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq);
extern int mpc52xx_gpt_start_timer(struct mpc52xx_gpt_priv *gpt, u64 period,
int continuous);
-extern void mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt);
+extern u64 mpc52xx_gpt_timer_period(struct mpc52xx_gpt_priv *gpt);
+extern int mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt);
/* mpc52xx_lpbfifo.c */
#define MPC52XX_LPBFIFO_FLAG_READ (0)