]> err.no Git - linux-2.6/commitdiff
[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix-2
authorAndrew Morton <akpm@linux-foundation.org>
Thu, 7 Jun 2007 23:08:53 +0000 (16:08 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 10 Jun 2007 20:11:10 +0000 (20:11 +0000)
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>
drivers/char/watchdog/at32ap700x_wdt.c

index 588b26d400cdc06de7459770f35ef3eb3cb7d0f6..f08ea9493d2fbf38597c3a010700a320ce5a79b4 100644 (file)
@@ -283,14 +283,15 @@ static int at32_wdt_resume(struct platform_device *pdev)
                at32_wdt_start();
        return 0;
 }
+#else
+#define at32_wdt_suspend NULL
+#define at32_wdt_resume NULL
 #endif
 
 static struct platform_driver at32_wdt_driver = {
        .remove         = __exit_p(at32_wdt_remove),
-#ifdef CONFIG_PM
        .suspend        = at32_wdt_suspend,
        .resume         = at32_wdt_resume,
-#endif
        .driver         = {
                .name   = "at32_wdt",
                .owner  = THIS_MODULE,