projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with Linus' kernel.
[powerpc.git]
/
drivers
/
i2c
/
chips
/
ds1374.c
diff --git
a/drivers/i2c/chips/ds1374.c
b/drivers/i2c/chips/ds1374.c
index
da488b7
..
0710b9d
100644
(file)
--- a/
drivers/i2c/chips/ds1374.c
+++ b/
drivers/i2c/chips/ds1374.c
@@
-232,10
+232,10
@@
static int ds1374_detach(struct i2c_client *client)
}
static struct i2c_driver ds1374_driver = {
}
static struct i2c_driver ds1374_driver = {
- .owner = THIS_MODULE,
- .name = DS1374_DRV_NAME,
+ .driver = {
+ .name = DS1374_DRV_NAME,
+ },
.id = I2C_DRIVERID_DS1374,
.id = I2C_DRIVERID_DS1374,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = ds1374_attach,
.detach_client = ds1374_detach,
};
.attach_adapter = ds1374_attach,
.detach_client = ds1374_detach,
};