This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] rc tables: include linux/module.h
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Fri Sep 23 15:33:27 2011 -0300

Prevents errors when merging with -next:

drivers/media/rc/keymaps/rc-snapstream-firefly.c:105:16: error: expected 
declaration specifiers or ‘...’ before string constant
drivers/media/rc/keymaps/rc-snapstream-firefly.c:106:15: error: expected 
declaration specifiers or ‘...’ before string constant

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/rc/keymaps/rc-ati-x10.c            |    1 +
 drivers/media/rc/keymaps/rc-medion-x10.c         |    1 +
 drivers/media/rc/keymaps/rc-snapstream-firefly.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=547d42eac107f027e6101b828f9e4075f2fbcc7c

diff --git a/drivers/media/rc/keymaps/rc-ati-x10.c 
b/drivers/media/rc/keymaps/rc-ati-x10.c
index f3397f8..e1b8b26 100644
--- a/drivers/media/rc/keymaps/rc-ati-x10.c
+++ b/drivers/media/rc/keymaps/rc-ati-x10.c
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/module.h>
 #include <media/rc-map.h>
 
 static struct rc_map_table ati_x10[] = {
diff --git a/drivers/media/rc/keymaps/rc-medion-x10.c 
b/drivers/media/rc/keymaps/rc-medion-x10.c
index 5fc57468..09e2cc0 100644
--- a/drivers/media/rc/keymaps/rc-medion-x10.c
+++ b/drivers/media/rc/keymaps/rc-medion-x10.c
@@ -21,6 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/module.h>
 #include <media/rc-map.h>
 
 static struct rc_map_table medion_x10[] = {
diff --git a/drivers/media/rc/keymaps/rc-snapstream-firefly.c 
b/drivers/media/rc/keymaps/rc-snapstream-firefly.c
index 5836aa2..ef14652 100644
--- a/drivers/media/rc/keymaps/rc-snapstream-firefly.c
+++ b/drivers/media/rc/keymaps/rc-snapstream-firefly.c
@@ -18,6 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/module.h>
 #include <media/rc-map.h>
 
 static struct rc_map_table snapstream_firefly[] = {

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to