diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 05:39:30 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 05:39:30 -0500 |
commit | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (patch) | |
tree | d6e3f7e8ac8a6c567d800fb30e237eb788ac3edf /drivers/media/video/arv.c | |
parent | 4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d (diff) | |
parent | 21e2379b9ef705fcb3ba3be738decd3397fc30b7 (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/arv.c')
-rw-r--r-- | drivers/media/video/arv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 7d5a068353f2..994b75fe165a 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -129,9 +129,9 @@ static unsigned char yuv[MAX_AR_FRAME_BYTES]; | |||
129 | static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */ | 129 | static int freq = DEFAULT_FREQ; /* BCLK: available 50 or 70 (MHz) */ |
130 | static int vga = 0; /* default mode(0:QVGA mode, other:VGA mode) */ | 130 | static int vga = 0; /* default mode(0:QVGA mode, other:VGA mode) */ |
131 | static int vga_interlace = 0; /* 0 is normal mode for, else interlace mode */ | 131 | static int vga_interlace = 0; /* 0 is normal mode for, else interlace mode */ |
132 | MODULE_PARM(freq, "i"); | 132 | module_param(freq, int, 0); |
133 | MODULE_PARM(vga, "i"); | 133 | module_param(vga, int, 0); |
134 | MODULE_PARM(vga_interlace, "i"); | 134 | module_param(vga_interlace, int, 0); |
135 | 135 | ||
136 | static int ar_initialize(struct video_device *dev); | 136 | static int ar_initialize(struct video_device *dev); |
137 | 137 | ||