diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:14:48 -0800 |
| commit | bd842b53fada517017d192c8a12fc9a38e6250e1 (patch) | |
| tree | 57399eb06aba47199535f8a5d42023465eb5001f /drivers/watchdog | |
| parent | 5a5f348ffc433c0483b5c13ebefe73adb5e68f2b (diff) | |
| parent | d77cf23f1befd3922d81b91cb01fd3da619e0206 (diff) | |
Merge commit 'v2.6.36.3' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/rdc321x_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c index 428f8a1583e8..3939e53f5f98 100644 --- 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 = pdev->dev.platform_data; + pdata = platform_get_drvdata(pdev); if (!pdata) { dev_err(&pdev->dev, "no platform data supplied\n"); return -ENODEV; |