diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 12:39:14 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 12:39:14 +0000 |
commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
tree | e4d79479a1280ad4841005680e37119d6694c3bf /drivers/serial/pxa.c | |
parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/serial/pxa.c')
-rw-r--r-- | drivers/serial/pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index abc00be5543..8ea314bc00c 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -766,7 +766,7 @@ static int serial_pxa_probe(struct platform_device *dev) if (!sport) return -ENOMEM; - sport->clk = clk_get(&dev->dev, "UARTCLK"); + sport->clk = clk_get(&dev->dev, NULL); if (IS_ERR(sport->clk)) { ret = PTR_ERR(sport->clk); goto err_free; |