summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorJean Delvare2009-05-13 21:48:07 +0200
committerMauro Carvalho Chehab2009-06-16 23:21:11 +0200
commit1df8e9861cf9fac5737ccb61c7f7fefa77711d40 (patch)
treebacc30f912a50aeff07f869f610e76845bd1d148 /include/media
parentV4L/DVB (11842): radio-mr800.c: missing mutex include (diff)
downloadkernel-qcow2-linux-1df8e9861cf9fac5737ccb61c7f7fefa77711d40.tar.gz
kernel-qcow2-linux-1df8e9861cf9fac5737ccb61c7f7fefa77711d40.tar.xz
kernel-qcow2-linux-1df8e9861cf9fac5737ccb61c7f7fefa77711d40.zip
V4L/DVB (11843): ir-kbd-i2c: Don't use i2c_client.name for our own needs
In the standard device driver binding model, the name field of struct i2c_client is used to match devices to their drivers, so we must stop using it for internal purposes. Define a separate field in struct IR_i2c as a replacement, and use it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/ir-kbd-i2c.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 07963d705400..6a9719c8e903 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -15,6 +15,7 @@ struct IR_i2c {
unsigned char old;
struct delayed_work work;
+ char name[32];
char phys[32];
int (*get_key)(struct IR_i2c*, u32*, u32*);
};