rpms/kernel/devel kernel-2.6.spec, 1.1360, 1.1361 linux-2.6.11-compile-fixes.patch, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6.11-compile-fixes.patch 
Log Message:
Make sure patch is applied.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1360
retrieving revision 1.1361
diff -u -r1.1360 -r1.1361
--- kernel-2.6.spec	28 May 2005 22:52:30 -0000	1.1360
+++ kernel-2.6.spec	29 May 2005 00:25:23 -0000	1.1361
@@ -375,6 +375,7 @@
 
 Patch10000: linux-2.6.0-compile.patch
 Patch10001: linux-2.6.10-compile-fixes.patch
+Patch10002: linux-2.6.11-compile-fixes.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -839,6 +840,7 @@
 #
 %patch10000 -p1
 %patch10001 -p1
+%patch10002 -p1
 
 
 # END OF PATCH APPLICATIONS

linux-2.6.11-compile-fixes.patch:
 char/agp/hp-agp.c              |    3 +--
 firmware/pcdp.c                |    1 +
 firmware/pcdp.h                |    2 ++
 usb/media/pwc/pwc-ctrl.c       |    2 --
 usb/media/pwc/pwc-uncompress.c |    2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

Index: linux-2.6.11-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-compile-fixes.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6.11-compile-fixes.patch	29 May 2005 00:11:16 -0000	1.22
+++ linux-2.6.11-compile-fixes.patch	29 May 2005 00:25:23 -0000	1.23
@@ -1,19 +1,3 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-10001/include/linux/init.h linux-10002/include/linux/init.h
---- linux-10001/include/linux/init.h
-+++ linux-10002/include/linux/init.h
-@@ -46,11 +46,7 @@
- #define __exitdata	__attribute__ ((__section__(".exit.data")))
- #define __exit_call	__attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
- 
--#ifdef MODULE
--#define __exit		__attribute__ ((__section__(".exit.text")))
--#else
- #define __exit		__attribute_used__ __attribute__ ((__section__(".exit.text")))
--#endif
- 
- /* For assembly routines */
- #define __INIT		.section	".init.text","ax"
-
 --- linux-2.6.11/drivers/firmware/pcdp.c~	2005-05-28 19:12:41.000000000 -0400
 +++ linux-2.6.11/drivers/firmware/pcdp.c	2005-05-28 19:12:51.000000000 -0400
 @@ -15,6 +15,7 @@