git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i2c: Add support for device alias names
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
cx25840
/
cx25840-core.c
diff --git
a/drivers/media/video/cx25840/cx25840-core.c
b/drivers/media/video/cx25840/cx25840-core.c
index
7fde678
..
8882381
100644
(file)
--- a/
drivers/media/video/cx25840/cx25840-core.c
+++ b/
drivers/media/video/cx25840/cx25840-core.c
@@
-1209,7
+1209,8
@@
static int cx25840_command(struct i2c_client *client, unsigned int cmd,
/* ----------------------------------------------------------------------- */
/* ----------------------------------------------------------------------- */
-static int cx25840_probe(struct i2c_client *client)
+static int cx25840_probe(struct i2c_client *client,
+ const struct i2c_device_id *did)
{
struct cx25840_state *state;
u32 id;
{
struct cx25840_state *state;
u32 id;