diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 19:27:30 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 19:27:30 +0400 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/media/platform/soc_camera/mx2_camera.c | |
| parent | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff) | |
| parent | d01723479e6a6c70c83295f7847477a016d5e14a (diff) | |
| download | linux-210b1847b32951f52d19df229972399e5b987de2.tar.xz | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/media/platform/soc_camera/mx2_camera.c')
| -rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 791cd1d54a76..8bda2c908aba 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@ -1692,7 +1692,7 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) return IRQ_HANDLED; } -static int __devinit mx27_camera_emma_init(struct platform_device *pdev) +static int mx27_camera_emma_init(struct platform_device *pdev) { struct mx2_camera_dev *pcdev = platform_get_drvdata(pdev); struct resource *res_emma; @@ -1750,7 +1750,7 @@ out: return err; } -static int __devinit mx2_camera_probe(struct platform_device *pdev) +static int mx2_camera_probe(struct platform_device *pdev) { struct mx2_camera_dev *pcdev; struct resource *res_csi; @@ -1887,7 +1887,7 @@ exit: return err; } -static int __devexit mx2_camera_remove(struct platform_device *pdev) +static int mx2_camera_remove(struct platform_device *pdev) { struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev); struct mx2_camera_dev *pcdev = container_of(soc_host, @@ -1912,7 +1912,7 @@ static struct platform_driver mx2_camera_driver = { .name = MX2_CAM_DRV_NAME, }, .id_table = mx2_camera_devtype, - .remove = __devexit_p(mx2_camera_remove), + .remove = mx2_camera_remove, }; |