diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-19 10:33:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-19 10:33:34 +1100 |
| commit | 94f2503931020a95ec34219f0226b611bc1c1a11 (patch) | |
| tree | 951df2f02cea670f99df3542cd07cbcb3dcd39ed /drivers/char | |
| parent | c1fd873437a4745b39c05c463ce75ae45ad47692 (diff) | |
| parent | ff921aa2a058a1fb3e3fd8def8f2c74e8deb20b5 (diff) | |
Merge commit 'arm-current/master'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/omap-rng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index d4e7dca06e4f..ba68a4671cb5 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev) return -EBUSY; if (cpu_is_omap24xx()) { - rng_ick = clk_get(NULL, "rng_ick"); + rng_ick = clk_get(&pdev->dev, "rng_ick"); if (IS_ERR(rng_ick)) { dev_err(&pdev->dev, "Could not get rng_ick\n"); ret = PTR_ERR(rng_ick); |