diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 05:23:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 05:23:38 -0500 |
| commit | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (patch) | |
| tree | 68ea1c8f9c446d6ebd96caf3ba4ec73f1fa5ace6 /drivers/watchdog | |
| parent | cde9efef401563943d5a58eb9b7274bfdc08ca9b (diff) | |
| parent | a58154d1c3535f451a409abbd0bda6770b2d9380 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 2ee7dac55a3c..86f7cac1026c 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c | |||
| @@ -270,7 +270,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) | |||
| 270 | return -ENOMEM; | 270 | return -ENOMEM; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | imx2_wdt.clk = clk_get_sys("imx-wdt.0", NULL); | 273 | imx2_wdt.clk = clk_get(&pdev->dev, NULL); |
| 274 | if (IS_ERR(imx2_wdt.clk)) { | 274 | if (IS_ERR(imx2_wdt.clk)) { |
| 275 | dev_err(&pdev->dev, "can't get Watchdog clock\n"); | 275 | dev_err(&pdev->dev, "can't get Watchdog clock\n"); |
| 276 | return PTR_ERR(imx2_wdt.clk); | 276 | return PTR_ERR(imx2_wdt.clk); |