summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tda9840.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-01-07 00:25:08 +0100
committerLinus Torvalds2006-01-07 00:25:08 +0100
commit0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch)
tree22c71657387b42787bc070502899a881ed909f39 /drivers/media/video/tda9840.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentMerge ../torvalds-2.6/ (diff)
downloadkernel-qcow2-linux-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.tar.gz
kernel-qcow2-linux-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.tar.xz
kernel-qcow2-linux-0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/tda9840.c')
-rw-r--r--drivers/media/video/tda9840.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 0cb5c7e9a884..ed4c04119ccc 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -221,10 +221,10 @@ static int detach(struct i2c_client *client)
}
static struct i2c_driver driver = {
- .owner = THIS_MODULE,
- .name = "tda9840",
+ .driver = {
+ .name = "tda9840",
+ },
.id = I2C_DRIVERID_TDA9840,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = attach,
.detach_client = detach,
.command = command,