tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds bbbb45a0 35dead42

+2 -2
+2 -2
drivers/watchdog/rc32434_wdt.c
··· 62 62 static int timeout = WATCHDOG_TIMEOUT; 63 63 module_param(timeout, int, 0); 64 64 MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default=" 65 - WATCHDOG_TIMEOUT ")"); 65 + __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); 66 66 67 67 static int nowayout = WATCHDOG_NOWAYOUT; 68 68 module_param(nowayout, int, 0); ··· 276 276 return -ENODEV; 277 277 } 278 278 279 - wdt_reg = ioremap_nocache(r->start, r->end - r->start); 279 + wdt_reg = ioremap_nocache(r->start, resource_size(r)); 280 280 if (!wdt_reg) { 281 281 printk(KERN_ERR PFX "failed to remap I/O resources\n"); 282 282 return -ENXIO;