diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/w1/masters | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/w1/masters')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index b9d74d0b353e..65244c02551b 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
| @@ -116,7 +116,7 @@ static int __init mxc_w1_probe(struct platform_device *pdev) | |||
| 116 | if (!mdev) | 116 | if (!mdev) |
| 117 | return -ENOMEM; | 117 | return -ENOMEM; |
| 118 | 118 | ||
| 119 | mdev->clk = clk_get(&pdev->dev, "owire_clk"); | 119 | mdev->clk = clk_get(&pdev->dev, "owire"); |
| 120 | if (!mdev->clk) { | 120 | if (!mdev->clk) { |
| 121 | err = -ENODEV; | 121 | err = -ENODEV; |
| 122 | goto failed_clk; | 122 | goto failed_clk; |