From 0e650ecf01a6a8fcd338d71822ad92d24dbdbb7f Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:38 -0500
Subject: [PATCH] --- yaml --- r: 338123 b: refs/heads/master c:
 8aa1be45f9cacc95efd0720bbed497d15ff7cc31 h: refs/heads/master i:   338121:
 aa1793fd71ed62dd501da5c4420890f4d40d1b78   338119:
 d8138aa56baa803215985c54eae33cbf81e742d9 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 75f4e3b1e4bd..172d25a43cf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b1e01264c2f1777c8a20637e91943d723ee8f35
+refs/heads/master: 8aa1be45f9cacc95efd0720bbed497d15ff7cc31
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 b1fcf0225705..677e665ca86d 100644
--- a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
+++ b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
@@ -1136,7 +1136,7 @@ static int ipu_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit ipu_remove(struct platform_device *pdev)
+static int ipu_remove(struct platform_device *pdev)
 {
 	struct ipu_soc *ipu = platform_get_drvdata(pdev);
 	struct resource *res;
diff --git a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c
index 46f137f1c2c0..1892006526b5 100644
--- a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -554,7 +554,7 @@ static int ipu_drm_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit ipu_drm_remove(struct platform_device *pdev)
+static int ipu_drm_remove(struct platform_device *pdev)
 {
 	struct ipu_crtc *ipu_crtc = platform_get_drvdata(pdev);
 
diff --git a/trunk/drivers/staging/imx-drm/parallel-display.c b/trunk/drivers/staging/imx-drm/parallel-display.c
index 9b9f0fe4f5ca..a8064fcc03d1 100644
--- a/trunk/drivers/staging/imx-drm/parallel-display.c
+++ b/trunk/drivers/staging/imx-drm/parallel-display.c
@@ -235,7 +235,7 @@ static int imx_pd_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit imx_pd_remove(struct platform_device *pdev)
+static int imx_pd_remove(struct platform_device *pdev)
 {
 	struct imx_parallel_display *imxpd = platform_get_drvdata(pdev);
 	struct drm_connector *connector = &imxpd->connector;