diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 02:25:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 02:25:08 +0300 |
| commit | 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch) | |
| tree | 22c71657387b42787bc070502899a881ed909f39 /drivers/media/video/tvmixer.c | |
| parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
| parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) | |
| download | linux-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/tvmixer.c')
| -rw-r--r-- | drivers/media/video/tvmixer.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c index 8318bd1aad00..e837f9f7fed6 100644 --- a/drivers/media/video/tvmixer.c +++ b/drivers/media/video/tvmixer.c @@ -228,16 +228,14 @@ static int tvmixer_release(struct inode *inode, struct file *file) static struct i2c_driver driver = { #ifdef I2C_PEC - .owner = THIS_MODULE, -#endif + .driver = { + .name = "tv card mixer driver", + }, +#else .name = "tv card mixer driver", +#endif .id = I2C_DRIVERID_TVMIXER, -#ifdef I2C_DF_DUMMY - .flags = I2C_DF_DUMMY, -#else - .flags = I2C_DF_NOTIFY, .detach_adapter = tvmixer_adapters, -#endif .attach_adapter = tvmixer_adapters, .detach_client = tvmixer_clients, }; |