diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 15:38:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-02 15:38:49 -0800 |
| commit | bbbb45a02ba1c4dcec2fe2b5531750d6616765b9 (patch) | |
| tree | cdc0f8fc2f27608f7c32d1069baeeae2b13432f1 | |
| parent | 35dead4235e2b67da7275b4122fed37099c2f462 (diff) | |
| parent | 810a90ae4d2a9f6d9ff80424accbd6f91947e981 (diff) | |
| download | linux-3.10-bbbb45a02ba1c4dcec2fe2b5531750d6616765b9.tar.gz linux-3.10-bbbb45a02ba1c4dcec2fe2b5531750d6616765b9.tar.bz2 linux-3.10-bbbb45a02ba1c4dcec2fe2b5531750d6616765b9.zip | |
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:
[PATCH] rc32434_wdt: fix compilation failure
[WATCHDOG] rc32434_wdt.c: use resource_size()
| -rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index f6cccc9df02..bf12d06b587 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -62,7 +62,7 @@ extern unsigned int idt_cpu_freq; static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default=" - WATCHDOG_TIMEOUT ")"); + __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); @@ -276,7 +276,7 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev) return -ENODEV; } - wdt_reg = ioremap_nocache(r->start, r->end - r->start); + wdt_reg = ioremap_nocache(r->start, resource_size(r)); if (!wdt_reg) { printk(KERN_ERR PFX "failed to remap I/O resources\n"); return -ENXIO; |