diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 10:12:06 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 10:12:06 (GMT) |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /drivers/media/video/wm8775.c | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
| download | linux-fsl-qoriq-2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92.tar.xz | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'drivers/media/video/wm8775.c')
| -rw-r--r-- | drivers/media/video/wm8775.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c index 869f9e7..67a409e 100644 --- a/drivers/media/video/wm8775.c +++ b/drivers/media/video/wm8775.c @@ -159,7 +159,8 @@ static int wm8775_command(struct i2c_client *client, unsigned cmd, void *arg) * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1' */ -static int wm8775_probe(struct i2c_client *client) +static int wm8775_probe(struct i2c_client *client, + const struct i2c_device_id *id) { struct wm8775_state *state; |