diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/i2c/chips/pcf8574.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/i2c/chips/pcf8574.c')
| -rw-r--r-- | drivers/i2c/chips/pcf8574.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c index c323c2de236c..c3e6449c4481 100644 --- a/drivers/i2c/chips/pcf8574.c +++ b/drivers/i2c/chips/pcf8574.c | |||
| @@ -65,10 +65,10 @@ static void pcf8574_init_client(struct i2c_client *client); | |||
| 65 | 65 | ||
| 66 | /* This is the driver that will be inserted */ | 66 | /* This is the driver that will be inserted */ |
| 67 | static struct i2c_driver pcf8574_driver = { | 67 | static struct i2c_driver pcf8574_driver = { |
| 68 | .owner = THIS_MODULE, | 68 | .driver = { |
| 69 | .name = "pcf8574", | 69 | .name = "pcf8574", |
| 70 | }, | ||
| 70 | .id = I2C_DRIVERID_PCF8574, | 71 | .id = I2C_DRIVERID_PCF8574, |
| 71 | .flags = I2C_DF_NOTIFY, | ||
| 72 | .attach_adapter = pcf8574_attach_adapter, | 72 | .attach_adapter = pcf8574_attach_adapter, |
| 73 | .detach_client = pcf8574_detach_client, | 73 | .detach_client = pcf8574_detach_client, |
| 74 | }; | 74 | }; |