diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 08:05:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 08:05:56 -0800 |
| commit | 53f517a1f61ce69bf67898891d5b14ffaada0003 (patch) | |
| tree | da77afc9776822f1b55d7d29f7b869518e0722db /drivers/media/video/davinci/vpif_display.c | |
| parent | 04ed0978d5ca5a3460a6f1f7443f8147a183669f (diff) | |
| parent | 9a1f8b34aa539000da17a06235e4bec254d0bfb5 (diff) | |
| download | talos-op-linux-53f517a1f61ce69bf67898891d5b14ffaada0003.tar.gz talos-op-linux-53f517a1f61ce69bf67898891d5b14ffaada0003.zip | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions
[media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
Diffstat (limited to 'drivers/media/video/davinci/vpif_display.c')
| -rw-r--r-- | drivers/media/video/davinci/vpif_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index 685f6a6ee603..412c65d54fe1 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c @@ -1553,7 +1553,7 @@ static __init int vpif_probe(struct platform_device *pdev) for (i = 0; i < subdev_count; i++) { vpif_obj.sd[i] = v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev, - i2c_adap, NULL, + i2c_adap, &subdevdata[i].board_info, NULL); if (!vpif_obj.sd[i]) { |
