diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
| commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
| tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /drivers/media/video/via-camera.c | |
| parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
| parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
| download | blackbird-obmc-linux-67b738ef32df7ec429004866d2a739a3775894d2.tar.gz blackbird-obmc-linux-67b738ef32df7ec429004866d2a739a3775894d2.zip | |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'drivers/media/video/via-camera.c')
| -rw-r--r-- | drivers/media/video/via-camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index 02a21bccae18..9eda7cc03121 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c @@ -1360,7 +1360,7 @@ static __devinit int viacam_probe(struct platform_device *pdev) */ sensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31); cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter, - "ov7670", "ov7670", 0x42 >> 1, NULL); + "ov7670", 0x42 >> 1, NULL); if (cam->sensor == NULL) { dev_err(&pdev->dev, "Unable to find the sensor!\n"); ret = -ENODEV; |
