diff --git a/[refs] b/[refs]
index c81f6f5a2f0c..252023a38e00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7eccc46a1dae153d0102c161b4ce4bddb3f52ba
+refs/heads/master: 2dbd61b4651f0bdc6cd5f75a983844b5f3831e17
diff --git a/trunk/drivers/media/rc/ir-raw.c b/trunk/drivers/media/rc/ir-raw.c
index 185baddcbf14..73230ff93b8a 100644
--- a/trunk/drivers/media/rc/ir-raw.c
+++ b/trunk/drivers/media/rc/ir-raw.c
@@ -233,7 +233,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_handle);
 
 /* used internally by the sysfs interface */
 u64
-ir_raw_get_allowed_protocols()
+ir_raw_get_allowed_protocols(void)
 {
 	u64 protocols;
 	mutex_lock(&ir_raw_handler_lock);