diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
| commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
| tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/serial | |
| parent | 773e9610a7bd44720b8b625d01997b2953edc2db (diff) | |
| parent | ee569c43e340202fb0ba427c57b77568a32b9a3a (diff) | |
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 | ||||
| -rw-r--r-- | drivers/serial/amba-pl011.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 71562689116f..e3a5ad5ef1d6 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id) | |||
| 692 | goto free; | 692 | goto free; |
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 695 | uap->clk = clk_get(&dev->dev, NULL); |
| 696 | if (IS_ERR(uap->clk)) { | 696 | if (IS_ERR(uap->clk)) { |
| 697 | ret = PTR_ERR(uap->clk); | 697 | ret = PTR_ERR(uap->clk); |
| 698 | goto unmap; | 698 | goto unmap; |
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index b7180046f8db..8b2b9700f3e4 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id) | |||
| 756 | goto free; | 756 | goto free; |
| 757 | } | 757 | } |
| 758 | 758 | ||
| 759 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 759 | uap->clk = clk_get(&dev->dev, NULL); |
| 760 | if (IS_ERR(uap->clk)) { | 760 | if (IS_ERR(uap->clk)) { |
| 761 | ret = PTR_ERR(uap->clk); | 761 | ret = PTR_ERR(uap->clk); |
| 762 | goto unmap; | 762 | goto unmap; |