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/saa711x.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/saa711x.c')
| -rw-r--r-- | drivers/media/video/saa711x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c index 31f7b950b01..8008537391b 100644 --- a/drivers/media/video/saa711x.c +++ b/drivers/media/video/saa711x.c @@ -494,7 +494,6 @@ saa711x_detect_client (struct i2c_adapter *adapter, client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa711x; - client->flags = I2C_CLIENT_ALLOW_USE; strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client))); decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL); if (decoder == NULL) { @@ -565,11 +564,11 @@ saa711x_detach_client (struct i2c_client *client) /* ----------------------------------------------------------------------- */ static struct i2c_driver i2c_driver_saa711x = { - .owner = THIS_MODULE, - .name = "saa711x", + .driver = { + .name = "saa711x", + }, .id = I2C_DRIVERID_SAA711X, - .flags = I2C_DF_NOTIFY, .attach_adapter = saa711x_attach_adapter, .detach_client = saa711x_detach_client, |