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/i2c/chips/x1205.c | |
| parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
| parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/i2c/chips/x1205.c')
| -rw-r--r-- | drivers/i2c/chips/x1205.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/chips/x1205.c b/drivers/i2c/chips/x1205.c index 7da366cdc18c..245fffa92dbd 100644 --- a/drivers/i2c/chips/x1205.c +++ b/drivers/i2c/chips/x1205.c | |||
| @@ -105,9 +105,9 @@ static int x1205_command(struct i2c_client *client, unsigned int cmd, | |||
| 105 | void *arg); | 105 | void *arg); |
| 106 | 106 | ||
| 107 | static struct i2c_driver x1205_driver = { | 107 | static struct i2c_driver x1205_driver = { |
| 108 | .owner = THIS_MODULE, | 108 | .driver = { |
| 109 | .name = "x1205", | 109 | .name = "x1205", |
| 110 | .flags = I2C_DF_NOTIFY, | 110 | }, |
| 111 | .attach_adapter = &x1205_attach, | 111 | .attach_adapter = &x1205_attach, |
| 112 | .detach_client = &x1205_detach, | 112 | .detach_client = &x1205_detach, |
| 113 | }; | 113 | }; |