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/eeprom.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/i2c/chips/eeprom.c')
| -rw-r--r-- | drivers/i2c/chips/eeprom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c index 4baf573fa04f..41116b7947f6 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/i2c/chips/eeprom.c | |||
| @@ -68,10 +68,10 @@ static int eeprom_detach_client(struct i2c_client *client); | |||
| 68 | 68 | ||
| 69 | /* This is the driver that will be inserted */ | 69 | /* This is the driver that will be inserted */ |
| 70 | static struct i2c_driver eeprom_driver = { | 70 | static struct i2c_driver eeprom_driver = { |
| 71 | .owner = THIS_MODULE, | 71 | .driver = { |
| 72 | .name = "eeprom", | 72 | .name = "eeprom", |
| 73 | }, | ||
| 73 | .id = I2C_DRIVERID_EEPROM, | 74 | .id = I2C_DRIVERID_EEPROM, |
| 74 | .flags = I2C_DF_NOTIFY, | ||
| 75 | .attach_adapter = eeprom_attach_adapter, | 75 | .attach_adapter = eeprom_attach_adapter, |
| 76 | .detach_client = eeprom_detach_client, | 76 | .detach_client = eeprom_detach_client, |
| 77 | }; | 77 | }; |