diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
commit | 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch) | |
tree | 22c71657387b42787bc070502899a881ed909f39 /drivers/media/video/tda9875.c | |
parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/tda9875.c')
-rw-r--r-- | drivers/media/video/tda9875.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index a5e37dc91f39..9c3ecf7a0fed 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c | |||
@@ -372,10 +372,10 @@ static int tda9875_command(struct i2c_client *client, | |||
372 | 372 | ||
373 | 373 | ||
374 | static struct i2c_driver driver = { | 374 | static struct i2c_driver driver = { |
375 | .owner = THIS_MODULE, | 375 | .driver = { |
376 | .name = "i2c tda9875 driver", | 376 | .name = "i2c tda9875 driver", |
377 | }, | ||
377 | .id = I2C_DRIVERID_TDA9875, | 378 | .id = I2C_DRIVERID_TDA9875, |
378 | .flags = I2C_DF_NOTIFY, | ||
379 | .attach_adapter = tda9875_probe, | 379 | .attach_adapter = tda9875_probe, |
380 | .detach_client = tda9875_detach, | 380 | .detach_client = tda9875_detach, |
381 | .command = tda9875_command, | 381 | .command = tda9875_command, |