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/bt832.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/bt832.c')
-rw-r--r-- | drivers/media/video/bt832.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c index 07c78f1f7a44..cc54b62f4601 100644 --- a/drivers/media/video/bt832.c +++ b/drivers/media/video/bt832.c | |||
@@ -43,7 +43,7 @@ static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1, | |||
43 | I2C_CLIENT_END }; | 43 | I2C_CLIENT_END }; |
44 | I2C_CLIENT_INSMOD; | 44 | I2C_CLIENT_INSMOD; |
45 | 45 | ||
46 | int debug = 0; /* debug output */ | 46 | int debug; /* debug output */ |
47 | module_param(debug, int, 0644); | 47 | module_param(debug, int, 0644); |
48 | 48 | ||
49 | /* ---------------------------------------------------------------------- */ | 49 | /* ---------------------------------------------------------------------- */ |