Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit bbbb45a02ba1c4dcec2fe2b5531750d6616765b9

Authored by Linus Torvalds
2 parents 35dead4235 810a90ae4d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 1 changed file Side-by-side Diff

drivers/watchdog/rc32434_wdt.c
Diff comments   View file @ bbbb45a
... ... @@ -62,7 +62,7 @@
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,7 +276,7 @@
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;