diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 10:08:43 -0400 |
| commit | e6600d800fead3e895f16bf9b426578a6301af44 (patch) | |
| tree | fc2bb35ed142b96b31a04b52c3d097100e2653bd /drivers/usb/media/ov511.c | |
| parent | a1d4ebdbb3806e9d2c37f32a043ec54f4534977c (diff) | |
| parent | 3cb4a4f739cccdf0642fa7e3a087e0b8425ff67b (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/media/ov511.c')
| -rw-r--r-- | drivers/usb/media/ov511.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c index d6051822416e..036c485d1d1e 100644 --- a/drivers/usb/media/ov511.c +++ b/drivers/usb/media/ov511.c | |||
| @@ -5041,7 +5041,7 @@ ov6xx0_configure(struct usb_ov511 *ov) | |||
| 5041 | { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */ | 5041 | { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */ |
| 5042 | // { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */ | 5042 | // { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */ |
| 5043 | { OV511_I2C_BUS, 0x2d, 0x99 }, | 5043 | { OV511_I2C_BUS, 0x2d, 0x99 }, |
| 5044 | { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Procesing Parameter */ | 5044 | { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Processing Parameter */ |
| 5045 | { OV511_I2C_BUS, 0x34, 0xd2 }, /* Max A/D range */ | 5045 | { OV511_I2C_BUS, 0x34, 0xd2 }, /* Max A/D range */ |
| 5046 | { OV511_I2C_BUS, 0x38, 0x8b }, | 5046 | { OV511_I2C_BUS, 0x38, 0x8b }, |
| 5047 | { OV511_I2C_BUS, 0x39, 0x40 }, | 5047 | { OV511_I2C_BUS, 0x39, 0x40 }, |