Merge commit 'kumar/next' into merge

[pandora-kernel.git] / drivers / watchdog / indydog.c

diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index bea8a12..1cc5609 100644 (file)
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -111,7 +111,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd,
                                                        unsigned long arg)
 {
        int options, retval = -EINVAL;
-       static struct watchdog_info ident = {
+       static const struct watchdog_info ident = {
                .options                = WDIOF_KEEPALIVEPING,
                .firmware_version       = 0,
                .identity               = "Hardware Watchdog for SGI IP22",