diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:35:54 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 08:35:54 +0200 |
| commit | a6b5825aa703714523a745a8e050b9d6105f6704 (patch) | |
| tree | 1d5939799cfece8200f832f423fbb7fb57cc54b9 /drivers/video/omap/rfbi.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| parent | OMAP: DSS2: Add support for NV12 format (diff) | |
| download | linux-a6b5825aa703714523a745a8e050b9d6105f6704.tar.xz linux-a6b5825aa703714523a745a8e050b9d6105f6704.zip | |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/omap/rfbi.c')
| -rw-r--r-- | drivers/video/omap/rfbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index eada9f12efc7..0c6981f1a4a3 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -90,7 +90,7 @@ static int rfbi_get_clocks(void) return PTR_ERR(rfbi.dss_ick); } - rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck"); + rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "fck"); if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); |