aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-06-07 19:08:53 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-06-10 16:11:10 -0400
commit97a2a2ea1ad856d5375fecf689e253adca387602 (patch)
tree2f7ef7e2d28355c038d76230e52789530c4ffe31 /drivers/char/watchdog
parentc37f271320d595f46beb5a0ab7833107f461f6b6 (diff)
[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix-2
standard ifdef-reduction trick. Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: Hans-Christian Egtvedt <hcegtvedt@atmel.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/at32ap700x_wdt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/watchdog/at32ap700x_wdt.c b/drivers/char/watchdog/at32ap700x_wdt.c
index 588b26d400cd..f08ea9493d2f 100644
--- a/drivers/char/watchdog/at32ap700x_wdt.c
+++ b/drivers/char/watchdog/at32ap700x_wdt.c
@@ -283,14 +283,15 @@ static int at32_wdt_resume(struct platform_device *pdev)
283 at32_wdt_start(); 283 at32_wdt_start();
284 return 0; 284 return 0;
285} 285}
286#else
287#define at32_wdt_suspend NULL
288#define at32_wdt_resume NULL
286#endif 289#endif
287 290
288static struct platform_driver at32_wdt_driver = { 291static struct platform_driver at32_wdt_driver = {
289 .remove = __exit_p(at32_wdt_remove), 292 .remove = __exit_p(at32_wdt_remove),
290#ifdef CONFIG_PM
291 .suspend = at32_wdt_suspend, 293 .suspend = at32_wdt_suspend,
292 .resume = at32_wdt_resume, 294 .resume = at32_wdt_resume,
293#endif
294 .driver = { 295 .driver = {
295 .name = "at32_wdt", 296 .name = "at32_wdt",
296 .owner = THIS_MODULE, 297 .owner = THIS_MODULE,