From cb4b91af04f9aa6b2f5f16bc94a41fd5edc0da85 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:20:53 -0500
Subject: [PATCH] --- yaml --- r: 338141 b: refs/heads/master c:
 01f6f49b0abe4c0ca39e7af577f3dd889f0c6d78 h: refs/heads/master i:   338139:
 f08fdd68728fa8119d2fe3bacb1ab485cb5f869d v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/media/lirc/lirc_parallel.c | 2 +-
 trunk/drivers/staging/media/lirc/lirc_serial.c   | 2 +-
 trunk/drivers/staging/media/lirc/lirc_sir.c      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index be698c09a72d..17083f567854 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79fc8d891bf746c0f4da88f6fcca0f2cbcf21094
+refs/heads/master: 01f6f49b0abe4c0ca39e7af577f3dd889f0c6d78
diff --git a/trunk/drivers/staging/media/lirc/lirc_parallel.c b/trunk/drivers/staging/media/lirc/lirc_parallel.c
index dd2bca7b56fa..610230f535bf 100644
--- a/trunk/drivers/staging/media/lirc/lirc_parallel.c
+++ b/trunk/drivers/staging/media/lirc/lirc_parallel.c
@@ -606,7 +606,7 @@ static int lirc_parallel_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_parallel_driver = {
 	.probe	= lirc_parallel_probe,
-	.remove	= __devexit_p(lirc_parallel_remove),
+	.remove	= lirc_parallel_remove,
 	.suspend	= lirc_parallel_suspend,
 	.resume	= lirc_parallel_resume,
 	.driver	= {
diff --git a/trunk/drivers/staging/media/lirc/lirc_serial.c b/trunk/drivers/staging/media/lirc/lirc_serial.c
index 97ef67036e3f..002f3253b9ef 100644
--- a/trunk/drivers/staging/media/lirc/lirc_serial.c
+++ b/trunk/drivers/staging/media/lirc/lirc_serial.c
@@ -1148,7 +1148,7 @@ static int lirc_serial_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_serial_driver = {
 	.probe		= lirc_serial_probe,
-	.remove		= __devexit_p(lirc_serial_remove),
+	.remove		= lirc_serial_remove,
 	.suspend	= lirc_serial_suspend,
 	.resume		= lirc_serial_resume,
 	.driver		= {
diff --git a/trunk/drivers/staging/media/lirc/lirc_sir.c b/trunk/drivers/staging/media/lirc/lirc_sir.c
index 4afc3b419738..420e3df466d5 100644
--- a/trunk/drivers/staging/media/lirc/lirc_sir.c
+++ b/trunk/drivers/staging/media/lirc/lirc_sir.c
@@ -1230,7 +1230,7 @@ static int __devexit lirc_sir_remove(struct platform_device *dev)
 
 static struct platform_driver lirc_sir_driver = {
 	.probe		= lirc_sir_probe,
-	.remove		= __devexit_p(lirc_sir_remove),
+	.remove		= lirc_sir_remove,
 	.driver		= {
 		.name	= "lirc_sir",
 		.owner	= THIS_MODULE,