From a13cce91842f28025d7f2513d8be52fe62969335 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:59 -0500
Subject: [PATCH] --- yaml --- r: 338111 b: refs/heads/master c:
 673abc4411ef9391b949aa43cc77fe42d6a8571d h: refs/heads/master i:   338109:
 862cbeb8a9c55a280c757a6865811a415c6b20a4   338107:
 dac7c838899a097e9c65586ac0ef3dc30a1e035e   338103:
 8c8c2666797bbf478052123da66775e23b5ceb8b   338095:
 a46f5e6921a2c215847a5920eb963c0ba303977b   338079:
 ec0f1cb8beef777992b4d97fc0eb7e76d613a578   338047:
 3fb0f9c36da150754f04b2be5fdac31e249e8057 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d9390426a7a..1968287a06c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e530d26ba3dc59753e0d0b04fecdbb1f394c38
+refs/heads/master: 673abc4411ef9391b949aa43cc77fe42d6a8571d
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
index e33c64312b25..053479339935 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -471,7 +471,7 @@ static int omap3_bridge_startup(struct platform_device *pdev)
 	return err;
 }
 
-static int __devinit omap34_xx_bridge_probe(struct platform_device *pdev)
+static int omap34_xx_bridge_probe(struct platform_device *pdev)
 {
 	int err;
 	dev_t dev = 0;