diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 13:29:07 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 13:29:07 -0500 |
| commit | ec66ee3797e5848356cf593c6ec7aabf30a00cf1 (patch) | |
| tree | 7ed5c84cc914644ffa1cd1b6a2b45db53fc224e8 /drivers/media/radio/radio-si4713.c | |
| parent | 1205065764f2eda3216ebe213143f69891ee3460 (diff) | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
| download | op-kernel-dev-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.zip op-kernel-dev-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.tar.gz | |
Merge commit 'v2.6.37-rc6' into for-2.6.38
Diffstat (limited to 'drivers/media/radio/radio-si4713.c')
| -rw-r--r-- | drivers/media/radio/radio-si4713.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 6a43578..03829e6 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c @@ -291,7 +291,7 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev) goto unregister_v4l2_dev; } - sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter, NULL, + sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter, pdata->subdev_board_info, NULL); if (!sd) { dev_err(&pdev->dev, "Cannot get v4l2 subdevice\n"); |
