From d8138aa56baa803215985c54eae33cbf81e742d9 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:11 -0500 Subject: [PATCH] --- yaml --- r: 338119 b: refs/heads/master c: c4aabf8d323bb69934f4e627a43042c5bbfcd3cc h: refs/heads/master i: 338117: d1baf5eeccababb4560700b66cb19ff67f8126dd 338115: e88c8aa2998ec32eeaeb02c55d86117d765c62ba 338111: a13cce91842f28025d7f2513d8be52fe62969335 v: v3 --- [refs] | 2 +- trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 +- trunk/drivers/staging/imx-drm/ipuv3-crtc.c | 2 +- trunk/drivers/staging/imx-drm/parallel-display.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ad91270dd4f..95f88b117a61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 349affa1cec548820ba417523000f303527e0c04 +refs/heads/master: c4aabf8d323bb69934f4e627a43042c5bbfcd3cc diff --git a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c index 937c0b61b318..b1fcf0225705 100644 --- a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -1013,7 +1013,7 @@ static void ipu_irq_exit(struct ipu_soc *ipu) irq_free_descs(ipu->irq_start, IPU_NUM_IRQS); } -static int __devinit ipu_probe(struct platform_device *pdev) +static int ipu_probe(struct platform_device *pdev) { const struct of_device_id *of_id = of_match_device(imx_ipu_dt_ids, &pdev->dev); diff --git a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c index 33c82fb961e9..46f137f1c2c0 100644 --- a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c @@ -530,7 +530,7 @@ static int ipu_crtc_init(struct ipu_crtc *ipu_crtc, return ret; } -static int __devinit ipu_drm_probe(struct platform_device *pdev) +static int ipu_drm_probe(struct platform_device *pdev) { struct ipu_client_platformdata *pdata = pdev->dev.platform_data; struct ipu_crtc *ipu_crtc; diff --git a/trunk/drivers/staging/imx-drm/parallel-display.c b/trunk/drivers/staging/imx-drm/parallel-display.c index ba53778e2f0c..9b9f0fe4f5ca 100644 --- a/trunk/drivers/staging/imx-drm/parallel-display.c +++ b/trunk/drivers/staging/imx-drm/parallel-display.c @@ -189,7 +189,7 @@ static int imx_pd_register(struct imx_parallel_display *imxpd) return 0; } -static int __devinit imx_pd_probe(struct platform_device *pdev) +static int imx_pd_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; const u8 *edidp;