diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:25:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:25:08 -0800 |
| commit | 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch) | |
| tree | 22c71657387b42787bc070502899a881ed909f39 /drivers/media/video/indycam.c | |
| parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
| parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) | |
| download | lwn-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.tar.gz lwn-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/indycam.c')
| -rw-r--r-- | drivers/media/video/indycam.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c index deeef125eb92..bb5cbecffcc3 100644 --- a/drivers/media/video/indycam.c +++ b/drivers/media/video/indycam.c @@ -451,10 +451,10 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd, } static struct i2c_driver i2c_driver_indycam = { - .owner = THIS_MODULE, - .name = "indycam", + .driver = { + .name = "indycam", + }, .id = I2C_DRIVERID_INDYCAM, - .flags = I2C_DF_NOTIFY, .attach_adapter = indycam_probe, .detach_client = indycam_detach, .command = indycam_command, |