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/planb.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/planb.c')
| -rw-r--r-- | drivers/media/video/planb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index b19c33434eaf..f3fc361bec97 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c | |||
| @@ -76,9 +76,9 @@ static volatile struct planb_registers *planb_regs; | |||
| 76 | static int def_norm = PLANB_DEF_NORM; /* default norm */ | 76 | static int def_norm = PLANB_DEF_NORM; /* default norm */ |
| 77 | static int video_nr = -1; | 77 | static int video_nr = -1; |
| 78 | 78 | ||
| 79 | MODULE_PARM(def_norm, "i"); | 79 | module_param(def_norm, int, 0); |
| 80 | MODULE_PARM_DESC(def_norm, "Default startup norm (0=PAL, 1=NTSC, 2=SECAM)"); | 80 | MODULE_PARM_DESC(def_norm, "Default startup norm (0=PAL, 1=NTSC, 2=SECAM)"); |
| 81 | MODULE_PARM(video_nr,"i"); | 81 | module_param(video_nr, int, 0); |
| 82 | MODULE_LICENSE("GPL"); | 82 | MODULE_LICENSE("GPL"); |
| 83 | 83 | ||
| 84 | 84 | ||