diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:06:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 19:06:29 +0200 |
| commit | 1c00650c233c404fadf9347329214d55283bd17a (patch) | |
| tree | 9de7cda2fe2e54411cc24ff3befd758c9cb9cd74 /drivers/video | |
| parent | Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
| parent | i2c: I2C bus multiplexer driver pca954x (diff) | |
| download | linux-1c00650c233c404fadf9347329214d55283bd17a.tar.xz linux-1c00650c233c404fadf9347329214d55283bd17a.zip | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: I2C bus multiplexer driver pca954x
i2c: Multiplexed I2C bus core support
i2c: Use a separate mutex for userspace client lists
i2c: Make i2c_default_probe self-sufficient
i2c: Drop dummy variable
i2c: Move adapter locking helpers to i2c-core
V4L/DVB: Use custom I2C probing function mechanism
i2c: Add support for custom probe function
i2c-dev: Use memdup_user
i2c-dev: Remove unnecessary kmalloc casts
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/matrox/i2c-matroxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index 403b14445a78..0fb280ead3dc 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c @@ -191,7 +191,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { }; i2c_new_probed_device(&m2info->maven.adapter, - &maven_info, addr_list); + &maven_info, addr_list, NULL); } } return m2info; |