[gentoo-commits] linux-patches r1717 - genpatches-2.6/trunk/2.6.34

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-06-25 20:45:50 +0000 (Fri, 25 Jun 2010)
New Revision: 1717

Added:
   genpatches-2.6/trunk/2.6.34/2720_vgarrb-add-missing-define.patch
Modified:
   genpatches-2.6/trunk/2.6.34/0000_README
Log:
Add missing define to prevent re-define errors in vgaarb.h

Modified: genpatches-2.6/trunk/2.6.34/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.34/0000_README	2010-06-16 20:07:15 UTC (rev 1716)
+++ genpatches-2.6/trunk/2.6.34/0000_README	2010-06-25 20:45:50 UTC (rev 1717)
@@ -47,6 +47,10 @@
 From:	http://bugs.gentoo.org/show_bug.cgi?id=323021
 Desc:   Fix errors issued by modpost in vfb driver	
 
+Patch:	2720_vbfb-section-cleanup.patch
+From:	http://lkml.org/lkml/2010/6/25/271
+Desc:   add missing define to prevent re-define errors in vgaarb.h
+
 Patch:	2900_xconfig-with-qt4.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=320761
 Desc:	xconfig patch for qt4 - thanks to Sam Iam

Added: genpatches-2.6/trunk/2.6.34/2720_vgarrb-add-missing-define.patch
===================================================================
--- genpatches-2.6/trunk/2.6.34/2720_vgarrb-add-missing-define.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.34/2720_vgarrb-add-missing-define.patch	2010-06-25 20:45:50 UTC (rev 1717)
@@ -0,0 +1,19 @@
+vgaarb.h was missing the #define of the #ifndef at the top for the guard
+to prevent multiple #include's from causing re-define errors
+
+Signed-off-by: Doug Goldstein <cardoe@g.o>
+---
+ include/linux/vgaarb.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
+index c9a9759..814f294 100644
+--- a/include/linux/vgaarb.h
++++ b/include/linux/vgaarb.h
+@@ -29,6 +29,7 @@
+  */
+
+ #ifndef LINUX_VGA_H
++#define LINUX_VGA_H
+
+ #include <asm/vga.h>