diff options
| author | Albrecht Dreß <albrecht.dress@arcor.de> | 2009-11-13 13:09:31 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-13 13:09:31 -0500 |
| commit | eda43d16ef3d0bd59e3b762de3ffc73bab02efe9 (patch) | |
| tree | b183892818f6106e59e480ba31faf055127e15d7 /arch/powerpc/include | |
| parent | 13b600b59df287a175b1476d2d588ab935092b58 (diff) | |
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 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/mpc52xx.h | 3 |
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; | |||
| 281 | extern struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq); | 281 | extern struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq); |
| 282 | extern int mpc52xx_gpt_start_timer(struct mpc52xx_gpt_priv *gpt, u64 period, | 282 | extern int mpc52xx_gpt_start_timer(struct mpc52xx_gpt_priv *gpt, u64 period, |
| 283 | int continuous); | 283 | int continuous); |
| 284 | extern void mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt); | 284 | extern u64 mpc52xx_gpt_timer_period(struct mpc52xx_gpt_priv *gpt); |
| 285 | extern int mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt); | ||
| 285 | 286 | ||
| 286 | /* mpc52xx_lpbfifo.c */ | 287 | /* mpc52xx_lpbfifo.c */ |
| 287 | #define MPC52XX_LPBFIFO_FLAG_READ (0) | 288 | #define MPC52XX_LPBFIFO_FLAG_READ (0) |