diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /drivers/media/video/arv.c | |
parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) |
Merge 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 | ||