diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-20 10:24:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-20 10:24:46 -0700 |
| commit | d006de93531a9876b26919e9d2bbf562654ab736 (patch) | |
| tree | bc4b965e43ea446543cd2407d7bcec3efa9c09b1 /drivers/watchdog/sbc_epx_c3.c | |
| parent | 0ad79ed34c909205184cb85e855cdf3e17a6eac8 (diff) | |
| parent | 4e8858d5130459c4af80b990c2280115a1d49877 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Initconst section fixes for watchdog
watchdog: lantiq: fix watchdogs timeout handling
watchdog: hpwdt: prevent multiple "NMI occurred" messages
watchdog: WatchDog Timer Driver Core - use passed watchdog_device
Diffstat (limited to 'drivers/watchdog/sbc_epx_c3.c')
| -rw-r--r-- | drivers/watchdog/sbc_epx_c3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 3066a5127ca..eaca366b723 100644 --- a/drivers/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c @@ -173,7 +173,7 @@ static struct notifier_block epx_c3_notifier = { .notifier_call = epx_c3_notify_sys, }; -static const char banner[] __initdata = KERN_INFO PFX +static const char banner[] __initconst = KERN_INFO PFX "Hardware Watchdog Timer for Winsystems EPX-C3 SBC: 0.1\n"; static int __init watchdog_init(void) |