diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/media/video/bt832.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 | /* ---------------------------------------------------------------------- */ |