Merge branch 'v2.6.34-rc2' into drm-linus

[sfrench/cifs-2.6.git] / drivers / watchdog / ixp4xx_wdt.c

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 147b4d5c63b3bc85a1a5dbc08404bc62c96e8f6b..e02c0ecda26b73a7688ddc3352e99016350b67ab 100644 (file)
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -89,7 +89,7 @@ ixp4xx_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
        return len;
 }
 
-static struct watchdog_info ident = {
+static const struct watchdog_info ident = {
        .options        = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
                          WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
        .identity       = "IXP4xx Watchdog",