Merge branch 'fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / video / omap / lcdc.c

diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 83514f066712c4d3157b9c3c1c1b2a72d7b82d68..ab39492566771032148f844d1c51ca3d61a73aa2 100644 (file)
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -34,6 +34,8 @@
 
 #include <asm/mach-types.h>
 
+#include "lcdc.h"
+
 #define MODULE_NAME                    "lcdc"
 
 #define OMAP_LCDC_BASE                 0xfffec000
@@ -798,14 +800,14 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode,
        /* FIXME:
         * According to errata some platforms have a clock rate limitiation
         */
-       lcdc.lcd_ck = clk_get(NULL, "lcd_ck");
+       lcdc.lcd_ck = clk_get(fbdev->dev, "lcd_ck");
        if (IS_ERR(lcdc.lcd_ck)) {
                dev_err(fbdev->dev, "unable to access LCD clock\n");
                r = PTR_ERR(lcdc.lcd_ck);
                goto fail0;
        }
 
-       tc_ck = clk_get(NULL, "tc_ck");
+       tc_ck = clk_get(fbdev->dev, "tc_ck");
        if (IS_ERR(tc_ck)) {
                dev_err(fbdev->dev, "unable to access TC clock\n");
                r = PTR_ERR(tc_ck);