---

yaml --- r: 338141 b: refs/heads/master c: 01f6f49 h: refs/heads/master i: 338139: f08fdd6 v: v3
git-mirror · Nov 21, 2012 · cb4b91a · cb4b91a
1 parent 9cd731d
commit cb4b91a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,