Merge branches 'sched/urgent' and 'sched/rt' into sched/devel

[linux-2.6-omap-h63xx.git] / drivers / media / common / saa7146_hlp.c

diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index 2092e6c33dd289674a51b3c58a2389cb3c77ad4f..05bde9ccb770b377eb327409a707ef38b5e25a17 100644 (file)
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -158,7 +158,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
        }
 
        /* the horizontal scaling increment controls the UV filter
-          to reduce the bandwith to improve the display quality,
+          to reduce the bandwidth to improve the display quality,
           so set it ... */
        if ( xsci == 0x400)
                pfuv = 0x00;
@@ -312,7 +312,7 @@ static int sort_and_eliminate(u32* values, int* count)
                return -EINVAL;
        }
 
-       /* bubble sort the first ´count´ items of the array ´values´ */
+       /* bubble sort the first @count items of the array @values */
        for( top = *count; top > 0; top--) {
                for( low = 0, high = 1; high < top; low++, high++) {
                        if( values[low] > values[high] ) {
@@ -338,7 +338,7 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
        struct saa7146_video_dma *vdma2, u32* clip_format, u32* arbtr_ctrl, enum v4l2_field field)
 {
        struct saa7146_vv *vv = dev->vv_data;
-       u32 *clipping = vv->d_clipping.cpu_addr;
+       __le32 *clipping = vv->d_clipping.cpu_addr;
 
        int width = fh->ov.win.w.width;
        int height =  fh->ov.win.w.height;