From e54125c790d5936b1c681693e7c2f29c713fce2b Mon Sep 17 00:00:00 2001
From: Emil Goode <emilgoode@gmail.com>
Date: Sat, 7 Jul 2012 14:53:25 -0300
Subject: [PATCH] --- yaml --- r: 320683 b: refs/heads/master c:
 cadc7920acd7d8fadfe98a33068af764e3247da0 h: refs/heads/master i:   320681:
 9a2baf4e5eca9a96e6a25368a74abf7c55243a2f   320679:
 3c97dcfb45612c6d90951eabd1c8b51549d10418 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/media/lirc/lirc_bt829.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;