diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /drivers/watchdog | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
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); |