diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/watchdog/wm8350_wdt.c | |
| parent | drm/radeon/kms: disable MSI on IGP chips (diff) | |
| parent | Linux 2.6.34-rc2 (diff) | |
| download | linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/watchdog/wm8350_wdt.c')
| -rw-r--r-- | drivers/watchdog/wm8350_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index a2d2e8eb2282..89dd7b035295 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -177,7 +177,7 @@ static ssize_t wm8350_wdt_write(struct file *file, return count; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, .identity = "WM8350 Watchdog", }; |