diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
| commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
| tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/video/btcx-risc.c | |
| parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | talos-op-linux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.gz talos-op-linux-6ef62164e794c480259ac158aa6c8c7b85746545.zip | |
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/video/btcx-risc.c')
| -rw-r--r-- | drivers/media/video/btcx-risc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c index f42701f82e7f..3324ab38f58c 100644 --- a/drivers/media/video/btcx-risc.c +++ b/drivers/media/video/btcx-risc.c @@ -184,12 +184,12 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips) } void -btcx_calc_skips(int line, int width, unsigned int *maxy, +btcx_calc_skips(int line, int width, int *maxy, struct btcx_skiplist *skips, unsigned int *nskips, const struct v4l2_clip *clips, unsigned int nclips) { unsigned int clip,skip; - int end,maxline; + int end, maxline; skip=0; maxline = 9999; |
