diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
| commit | 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1 (patch) | |
| tree | 2ffc3f2ce655806424d022f3a4daec7665ab888f /drivers/media/video/bt8xx/bttv-risc.c | |
| parent | ec70cae8698632917f06110fdb70c6364281ecc6 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | talos-op-linux-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.tar.gz talos-op-linux-59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1.zip | |
Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect
Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-risc.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-risc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c index 649682aac1ac..5b1b8e4c78ba 100644 --- a/drivers/media/video/bt8xx/bttv-risc.c +++ b/drivers/media/video/bt8xx/bttv-risc.c @@ -244,7 +244,8 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc, const struct bttv_format *fmt, struct bttv_overlay *ov, int skip_even, int skip_odd) { - int dwords,rc,line,maxy,start,end,skip,nskips; + int dwords, rc, line, maxy, start, end; + unsigned skip, nskips; struct btcx_skiplist *skips; __le32 *rp; u32 ri,ra; |
