diff options
Diffstat (limited to 'drivers/media/platform/soc_camera/pxa_camera.c')
-rw-r--r-- | drivers/media/platform/soc_camera/pxa_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c index f3c1b6202425..1fbec5202e4f 100644 --- a/drivers/media/platform/soc_camera/pxa_camera.c +++ b/drivers/media/platform/soc_camera/pxa_camera.c | |||
@@ -1651,7 +1651,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { | |||
1651 | .set_bus_param = pxa_camera_set_bus_param, | 1651 | .set_bus_param = pxa_camera_set_bus_param, |
1652 | }; | 1652 | }; |
1653 | 1653 | ||
1654 | static int __devinit pxa_camera_probe(struct platform_device *pdev) | 1654 | static int pxa_camera_probe(struct platform_device *pdev) |
1655 | { | 1655 | { |
1656 | struct pxa_camera_dev *pcdev; | 1656 | struct pxa_camera_dev *pcdev; |
1657 | struct resource *res; | 1657 | struct resource *res; |
@@ -1801,7 +1801,7 @@ exit: | |||
1801 | return err; | 1801 | return err; |
1802 | } | 1802 | } |
1803 | 1803 | ||
1804 | static int __devexit pxa_camera_remove(struct platform_device *pdev) | 1804 | static int pxa_camera_remove(struct platform_device *pdev) |
1805 | { | 1805 | { |
1806 | struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev); | 1806 | struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev); |
1807 | struct pxa_camera_dev *pcdev = container_of(soc_host, | 1807 | struct pxa_camera_dev *pcdev = container_of(soc_host, |
@@ -1840,7 +1840,7 @@ static struct platform_driver pxa_camera_driver = { | |||
1840 | .pm = &pxa_camera_pm, | 1840 | .pm = &pxa_camera_pm, |
1841 | }, | 1841 | }, |
1842 | .probe = pxa_camera_probe, | 1842 | .probe = pxa_camera_probe, |
1843 | .remove = __devexit_p(pxa_camera_remove), | 1843 | .remove = pxa_camera_remove, |
1844 | }; | 1844 | }; |
1845 | 1845 | ||
1846 | module_platform_driver(pxa_camera_driver); | 1846 | module_platform_driver(pxa_camera_driver); |