rpms/kernel/devel kernel-2.6.spec, 1.2301, 1.2302 linux-2.6-compile-fixes.patch, 1.73, 1.74

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8828

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
buildenfixor.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2301
retrieving revision 1.2302
diff -u -r1.2301 -r1.2302
--- kernel-2.6.spec	22 Jun 2006 16:56:15 -0000	1.2301
+++ kernel-2.6.spec	22 Jun 2006 17:47:32 -0000	1.2302
@@ -1060,7 +1060,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- linux-2.6-compile-fixes.patch	9 May 2006 19:22:38 -0000	1.73
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 17:47:32 -0000	1.74
@@ -0,0 +1,20 @@
+current.diff
+
+kernel/power/main.c: In function 'suspend_prepare':
+kernel/power/main.c:89: error: implicit declaration of function 'suspend_console'
+kernel/power/main.c: In function 'suspend_finish':
+kernel/power/main.c:137: error: implicit declaration of function 'resume_console'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.17.noarch/kernel/power/main.c~	2006-06-22 13:45:57.827853000 -0400
++++ linux-2.6.17.noarch/kernel/power/main.c	2006-06-22 13:46:09.894764000 -0400
+@@ -15,7 +15,7 @@
+ #include <linux/errno.h>
+ #include <linux/init.h>
+ #include <linux/pm.h>
+-
++#include <linux/console.h>
+ 
+ #include "power.h"
+