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/i2c/busses/i2c-pxa.c | |
parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 906f9b9d715..587f5b2380d 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev) snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", i2c->adap.nr); - i2c->clk = clk_get(&dev->dev, "I2CCLK"); + i2c->clk = clk_get(&dev->dev, NULL); if (IS_ERR(i2c->clk)) { ret = PTR_ERR(i2c->clk); goto eclk; |