Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 97a2a2ea1ad856d5375fecf689e253adca387602

Authored by Andrew Morton
Committed by Wim Van Sebroeck
1 parent c37f271320
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/char/watchdog/at32ap700x_wdt.c
Diff comments   View file @ 97a2a2e
... ... @@ -283,14 +283,15 @@
283 283 at32_wdt_start();
284 284 return 0;
285 285 }
  286 +#else
  287 +#define at32_wdt_suspend NULL
  288 +#define at32_wdt_resume NULL
286 289 #endif
287 290  
288 291 static struct platform_driver at32_wdt_driver = {
289 292 .remove = __exit_p(at32_wdt_remove),
290   -#ifdef CONFIG_PM
291 293 .suspend = at32_wdt_suspend,
292 294 .resume = at32_wdt_resume,
293   -#endif
294 295 .driver = {
295 296 .name = "at32_wdt",
296 297 .owner = THIS_MODULE,