diff --git a/[refs] b/[refs]
index 17083f567854..2241fd0d2318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01f6f49b0abe4c0ca39e7af577f3dd889f0c6d78
+refs/heads/master: fd8413a2b8328801133e95b58d751bfe48b34303
diff --git a/trunk/drivers/staging/media/lirc/lirc_parallel.c b/trunk/drivers/staging/media/lirc/lirc_parallel.c
index 610230f535bf..f600c67b326f 100644
--- a/trunk/drivers/staging/media/lirc/lirc_parallel.c
+++ b/trunk/drivers/staging/media/lirc/lirc_parallel.c
@@ -583,7 +583,7 @@ static struct lirc_driver driver = {
 
 static struct platform_device *lirc_parallel_dev;
 
-static int __devinit lirc_parallel_probe(struct platform_device *dev)
+static int lirc_parallel_probe(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 002f3253b9ef..e182da4a9796 100644
--- a/trunk/drivers/staging/media/lirc/lirc_serial.c
+++ b/trunk/drivers/staging/media/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int hardware_init_port(void)
 	return 0;
 }
 
-static int __devinit lirc_serial_probe(struct platform_device *dev)
+static int lirc_serial_probe(struct platform_device *dev)
 {
 	int i, nlow, nhigh, result;
 
diff --git a/trunk/drivers/staging/media/lirc/lirc_sir.c b/trunk/drivers/staging/media/lirc/lirc_sir.c
index 420e3df466d5..9c211e72ea5b 100644
--- a/trunk/drivers/staging/media/lirc/lirc_sir.c
+++ b/trunk/drivers/staging/media/lirc/lirc_sir.c
@@ -1218,7 +1218,7 @@ static int init_lirc_sir(void)
 	return 0;
 }
 
-static int __devinit lirc_sir_probe(struct platform_device *dev)
+static int lirc_sir_probe(struct platform_device *dev)
 {
 	return 0;
 }