diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
| commit | d76fe430665fac3f44ee88958713ecc524fd778d (patch) | |
| tree | 00206c8b11eb2084d38eeccfe4b41f5e89fb779c /drivers/watchdog/coh901327_wdt.c | |
| parent | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
Merge commit 'v3.2' into rt-3.2-rt9v3.2-rt9
Diffstat (limited to 'drivers/watchdog/coh901327_wdt.c')
| -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 03f449a430d2..5b89f7d6cd0f 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; |