diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-10-03 10:52:58 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2011-12-26 15:14:24 +0100 |
| commit | 452190cb0526e9cc11b0998a600411cb9c7cd684 (patch) | |
| tree | 5649ade737534212ca5430ec652cfe3accb0b320 | |
| parent | 4962516b2309d76964f9df0d33e74f43b624a42d (diff) | |
| download | linux-3.10-452190cb0526e9cc11b0998a600411cb9c7cd684.tar.gz linux-3.10-452190cb0526e9cc11b0998a600411cb9c7cd684.tar.bz2 linux-3.10-452190cb0526e9cc11b0998a600411cb9c7cd684.zip | |
watchdog: move coh901327 state holders
The state holders used in the PM path of the drivers report as
unused variables when compiling without CONFIG_PM so let's
move them inside CONFIG_PM.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/coh901327_wdt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c index 03f449a430d..5b89f7d6cd0 100644 --- a/drivers/watchdog/coh901327_wdt.c +++ b/drivers/watchdog/coh901327_wdt.c @@ -76,8 +76,6 @@ static int irq; static void __iomem *virtbase; static unsigned long coh901327_users; static unsigned long boot_status; -static u16 wdogenablestore; -static u16 irqmaskstore; static struct device *parent; /* @@ -461,6 +459,10 @@ out: } #ifdef CONFIG_PM + +static u16 wdogenablestore; +static u16 irqmaskstore; + static int coh901327_suspend(struct platform_device *pdev, pm_message_t state) { irqmaskstore = readw(virtbase + U300_WDOG_IMR) & 0x0001U; |