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/adv7175.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/adv7175.c')
| -rw-r--r-- | drivers/media/video/adv7175.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index 173bca1e029..6d9536a71ee 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c @@ -470,7 +470,6 @@ adv7175_detect_client (struct i2c_adapter *adapter, client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_adv7175; - client->flags = I2C_CLIENT_ALLOW_USE; if ((client->addr == I2C_ADV7175 >> 1) || (client->addr == (I2C_ADV7175 >> 1) + 1)) { dname = adv7175_name; @@ -548,11 +547,11 @@ adv7175_detach_client (struct i2c_client *client) /* ----------------------------------------------------------------------- */ static struct i2c_driver i2c_driver_adv7175 = { - .owner = THIS_MODULE, - .name = "adv7175", /* name */ + .driver = { + .name = "adv7175", /* name */ + }, .id = I2C_DRIVERID_ADV7175, - .flags = I2C_DF_NOTIFY, .attach_adapter = adv7175_attach_adapter, .detach_client = adv7175_detach_client, |