diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:35:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:35:30 -0800 |
| commit | d4bab1b091be4a91a7363118c9ede3cc9a7fefd4 (patch) | |
| tree | b473b1bb53ef0fec027023ea6f419ea9894465dd /arch/powerpc | |
| parent | 56b78921c32ae825c596c158e74ab48c0e8e280d (diff) | |
| parent | 2786095a58fd55931fa0298ff6e3914331edaaf2 (diff) | |
| download | kernel_samsung_crespo-d4bab1b091be4a91a7363118c9ede3cc9a7fefd4.zip kernel_samsung_crespo-d4bab1b091be4a91a7363118c9ede3cc9a7fefd4.tar.gz kernel_samsung_crespo-d4bab1b091be4a91a7363118c9ede3cc9a7fefd4.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] i6300esb.c: change platform_driver to pci_driver
[WATCHDOG] i6300esb: fix unlock register with
[WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
[WATCHDOG] change reboot_notifier to platform-shutdown method.
[WATCHDOG] watchdog_info constify
[WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture
[WATCHDOG] iTCO_wdt: clean up probe(), modify err msg
[WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup
[WATCHDOG] support for max63xx watchdog timer chips
[WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver
[WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index 6f8ebe1..072b948 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -553,7 +553,7 @@ static ssize_t mpc52xx_wdt_write(struct file *file, const char __user *data, return 0; } -static struct watchdog_info mpc5200_wdt_info = { +static const struct watchdog_info mpc5200_wdt_info = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, .identity = WDT_IDENTITY, }; |