diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
commit | 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch) | |
tree | b5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /drivers/media/common/saa7146_hlp.c | |
parent | 32172561889868c0ea422ea8570f0413963a815f (diff) | |
parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
download | kernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.tar.gz kernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.tar.xz kernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.zip |
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'drivers/media/common/saa7146_hlp.c')
-rw-r--r-- | drivers/media/common/saa7146_hlp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index 9c905399a23..05bde9ccb77 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146_hlp.c @@ -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; |