diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:47:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:47:05 -0500 |
| commit | d1397f837647d8b6b3c9253a7e713d203f3cbb26 (patch) | |
| tree | 0bfe939169987703e63f3624d5dbb38938253760 /drivers/media/video/saa7134/saa7134-core.c | |
| parent | 278efe950988e72e2d0cea35059438fc27035d13 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 1a093bf176f3..23d8747338ed 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
| @@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | |||
| 71 | static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | 71 | static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; |
| 72 | static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | 72 | static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; |
| 73 | 73 | ||
| 74 | |||
| 74 | module_param_array(video_nr, int, NULL, 0444); | 75 | module_param_array(video_nr, int, NULL, 0444); |
| 75 | module_param_array(vbi_nr, int, NULL, 0444); | 76 | module_param_array(vbi_nr, int, NULL, 0444); |
| 76 | module_param_array(radio_nr, int, NULL, 0444); | 77 | module_param_array(radio_nr, int, NULL, 0444); |