Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=97a2a2ea1ad856d5375fecf689e253adca387602
Commit:     97a2a2ea1ad856d5375fecf689e253adca387602
Parent:     c37f271320d595f46beb5a0ab7833107f461f6b6
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 7 16:08:53 2007 -0700
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Sun Jun 10 20:11:10 2007 +0000

    [WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix-2
    
    standard ifdef-reduction trick.
    
    Cc: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Cc: Hans-Christian Egtvedt <[EMAIL PROTECTED]>
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/at32ap700x_wdt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/watchdog/at32ap700x_wdt.c 
b/drivers/char/watchdog/at32ap700x_wdt.c
index 588b26d..f08ea94 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)
                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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to