diff --git a/[refs] b/[refs]
index 3ea2ea536953..8c6fa2047641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73
+refs/heads/master: 6dd1119528d68e6f3a04874792048fc7be7611d7
diff --git a/trunk/drivers/staging/media/lirc/lirc_parallel.c b/trunk/drivers/staging/media/lirc/lirc_parallel.c
index f600c67b326f..ec14bc81851b 100644
--- a/trunk/drivers/staging/media/lirc/lirc_parallel.c
+++ b/trunk/drivers/staging/media/lirc/lirc_parallel.c
@@ -588,7 +588,7 @@ static int lirc_parallel_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int __devexit lirc_parallel_remove(struct platform_device *dev)
+static int lirc_parallel_remove(struct platform_device *dev)
 {
 	return 0;
 }
diff --git a/trunk/drivers/staging/media/lirc/lirc_serial.c b/trunk/drivers/staging/media/lirc/lirc_serial.c
index e182da4a9796..71e3bf2937f9 100644
--- a/trunk/drivers/staging/media/lirc/lirc_serial.c
+++ b/trunk/drivers/staging/media/lirc/lirc_serial.c
@@ -927,7 +927,7 @@ static int lirc_serial_probe(struct platform_device *dev)
 	return result;
 }
 
-static int __devexit lirc_serial_remove(struct platform_device *dev)
+static int lirc_serial_remove(struct platform_device *dev)
 {
 	free_irq(irq, (void *)&hardware);
 
diff --git a/trunk/drivers/staging/media/lirc/lirc_sir.c b/trunk/drivers/staging/media/lirc/lirc_sir.c
index 9c211e72ea5b..a45799874a21 100644
--- a/trunk/drivers/staging/media/lirc/lirc_sir.c
+++ b/trunk/drivers/staging/media/lirc/lirc_sir.c
@@ -1223,7 +1223,7 @@ static int lirc_sir_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int __devexit lirc_sir_remove(struct platform_device *dev)
+static int lirc_sir_remove(struct platform_device *dev)
 {
 	return 0;
 }