diff --git a/[refs] b/[refs]
index fe9d72f26dcd..979077ad2772 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a342daea70c4769ce7709c0f49aa17113228c1ed
+refs/heads/master: cadc7920acd7d8fadfe98a33068af764e3247da0
diff --git a/trunk/drivers/staging/media/lirc/lirc_bt829.c b/trunk/drivers/staging/media/lirc/lirc_bt829.c
index 4d20e9f74118..951007a3fc96 100644
--- a/trunk/drivers/staging/media/lirc/lirc_bt829.c
+++ b/trunk/drivers/staging/media/lirc/lirc_bt829.c
@@ -171,7 +171,7 @@ static void cycle_delay(int cycle)
 }
 
 
-static int poll_main()
+static int poll_main(void)
 {
 	unsigned char status_high, status_low;