diff options
| author | Anton Vorontsov <avorontsov@mvista.com> | 2010-04-27 00:59:53 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-04-27 09:58:47 +0200 |
| commit | d8d8b63b6dc413696ade040e52173c068df11702 (patch) | |
| tree | e0ec3289daa29b0ffe9b74073bcd6fa0b017a4ed /drivers/watchdog/booke_wdt.c | |
| parent | watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug. (diff) | |
| download | linux-d8d8b63b6dc413696ade040e52173c068df11702.tar.xz linux-d8d8b63b6dc413696ade040e52173c068df11702.zip | |
watchdog: booke_wdt: fix build - unconstify watchdog_info
commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG] watchdog_info
constify") introduced the following build failure:
CC booke_wdt.o
booke_wdt.c: In function 'booke_wdt_init':
booke_wdt.c:220: error: assignment of read-only variable 'ident'
Fix this by removing 'const' qualifier from watchdog_info struct.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/booke_wdt.c')
| -rw-r--r-- | drivers/watchdog/booke_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 500d38342e1e..801ead191499 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf, return count; } -static const struct watchdog_info ident = { +static struct watchdog_info ident = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, .identity = "PowerPC Book-E Watchdog", }; |