diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-02-22 16:44:25 -0600 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-02-22 16:44:25 -0600 |
| commit | 59907e088f4deec7ef2d651d884a4608e8db110e (patch) | |
| tree | e652c235cb4c2cffc9885c92253e437205f18cc3 /drivers/video/omap2/dss/dispc.c | |
| parent | 5afd1c5179a4f9e6e54527d2d52c250e30dc398d (diff) | |
| parent | 394f9168b509198235fe0cd019b3c1470cdd3648 (diff) | |
Merge tag 'L24.4-p1' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into richo
Conflicts:
drivers/media/video/omap/omap_vout.c
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
| -rwxr-xr-x | drivers/video/omap2/dss/dispc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 1beff6434935..a9a982167a5a 100755 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -1964,7 +1964,7 @@ static void calc_tiler_row_rotation(u8 rotation, return; } - printk(KERN_INFO + DSSDBG( " colormode: %d, rotation: %d, ps: %d, width: %d," " height: %d, row_inc:%d\n", color_mode, rotation, ps, width, height, *row_inc); @@ -2494,7 +2494,7 @@ static int _dispc_setup_plane(enum omap_plane plane, puv_addr = tiler_reorient_topleft( tiler_get_natural_addr(puv_addr), orient, tiler_width/2, tiler_height/2); - printk(KERN_INFO + DSSDBG( "rotated addresses: 0x%0x, 0x%0x\n", paddr, puv_addr); /* set BURSTTYPE if rotation is non-zero */ |