diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
| commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
| tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/media/video/saa711x.c | |
| parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
| parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/saa711x.c')
| -rw-r--r-- | drivers/media/video/saa711x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c index 8008537391b5..f39a7be08588 100644 --- a/drivers/media/video/saa711x.c +++ b/drivers/media/video/saa711x.c | |||
| @@ -567,9 +567,7 @@ static struct i2c_driver i2c_driver_saa711x = { | |||
| 567 | .driver = { | 567 | .driver = { |
| 568 | .name = "saa711x", | 568 | .name = "saa711x", |
| 569 | }, | 569 | }, |
| 570 | |||
| 571 | .id = I2C_DRIVERID_SAA711X, | 570 | .id = I2C_DRIVERID_SAA711X, |
| 572 | |||
| 573 | .attach_adapter = saa711x_attach_adapter, | 571 | .attach_adapter = saa711x_attach_adapter, |
| 574 | .detach_client = saa711x_detach_client, | 572 | .detach_client = saa711x_detach_client, |
| 575 | .command = saa711x_command, | 573 | .command = saa711x_command, |