summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSean MacLennan2010-03-09 01:46:41 +0100
committerWim Van Sebroeck2010-04-04 00:22:20 +0200
commit35c79780064976cf9d7537a00e59f97c2061fa7d (patch)
tree23f7131fb50d982b073b4974b8425fdb34d58754 /drivers
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadkernel-qcow2-linux-35c79780064976cf9d7537a00e59f97c2061fa7d.tar.gz
kernel-qcow2-linux-35c79780064976cf9d7537a00e59f97c2061fa7d.tar.xz
kernel-qcow2-linux-35c79780064976cf9d7537a00e59f97c2061fa7d.zip
[WATCHDOG] powerpc: pika_wdt ident cannot be const
The watchdog_info struct cannot be a const since we dynamically fill in the firmware version. Signed-off-by: Sean MacLennan <smaclennan@pikatech.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/pika_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index 435ec2aed4fe..2d22e996e996 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -52,7 +52,7 @@ static struct {
struct timer_list timer; /* The timer that pings the watchdog */
} pikawdt_private;
-static const struct watchdog_info ident = {
+static struct watchdog_info ident = {
.identity = DRV_NAME,
.options = WDIOF_CARDRESET |
WDIOF_SETTIMEOUT |