diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 18:46:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 18:46:52 +0100 |
| commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
| tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/serial/amba-pl011.c | |
| parent | [ARM] Update mach-types (diff) | |
| parent | [ARM] amba drivers: don't pass a consumer clock name for devices with unique ... (diff) | |
| download | linux-112243034cec7c3ef0499fdebf39218714da453d.tar.xz linux-112243034cec7c3ef0499fdebf39218714da453d.zip | |
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/serial/amba-pl011.c')
| -rw-r--r-- | drivers/serial/amba-pl011.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) goto free; } - uap->clk = clk_get(&dev->dev, "UARTCLK"); + uap->clk = clk_get(&dev->dev, NULL); if (IS_ERR(uap->clk)) { ret = PTR_ERR(uap->clk); goto unmap; |