projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/numa' into x86/urgent
[cascardo/linux.git]
/
drivers
/
watchdog
/
rdc321x_wdt.c
diff --git
a/drivers/watchdog/rdc321x_wdt.c
b/drivers/watchdog/rdc321x_wdt.c
index
428f8a1
..
3939e53
100644
(file)
--- a/
drivers/watchdog/rdc321x_wdt.c
+++ b/
drivers/watchdog/rdc321x_wdt.c
@@
-231,7
+231,7
@@
static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
struct resource *r;
struct rdc321x_wdt_pdata *pdata;
- pdata = p
dev->dev.platform_data
;
+ pdata = p
latform_get_drvdata(pdev)
;
if (!pdata) {
dev_err(&pdev->dev, "no platform data supplied\n");
return -ENODEV;