rpms/kernel/devel kernel-2.6.spec, 1.2951, 1.2952 linux-2.6-compile-fixes.patch, 1.136, 1.137

[fedora-cvs-commits at redhat.com]

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2951
retrieving revision 1.2952
diff -u -r1.2951 -r1.2952
--- kernel-2.6.spec	27 Feb 2007 01:48:11 -0000	1.2951
+++ kernel-2.6.spec	27 Feb 2007 01:56:36 -0000	1.2952
@@ -168,8 +168,7 @@
 # Which is a BadThing(tm).
 
 # We don't build a kernel on i386 or s390x -- we only do kernel-headers there.
-# ia64 still busted.
-%define nobuildarches i386 s390 ia64
+%define nobuildarches i386 s390
 
 %ifarch %nobuildarches
 %define buildup 0

linux-2.6-compile-fixes.patch:
 drivers/usb/mon/mon_bin.c                               |    2 +-
 drivers/usb/mon/mon_text.c                              |    2 +-
 drivers/usb/mon/usb_mon.h                               |    4 ++--
 linux-2.6.19.noarch/include/asm-powerpc/io.h            |    1 +
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c      |    4 ++++
 linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c |    3 +++
 6 files changed, 12 insertions(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- linux-2.6-compile-fixes.patch	21 Feb 2007 04:20:11 -0000	1.136
+++ linux-2.6-compile-fixes.patch	27 Feb 2007 01:56:36 -0000	1.137
@@ -90,3 +90,47 @@
  #include "nv_local.h"
  #include "nv_type.h"
  #include "nv_proto.h"
+Backport of
+
+http://marc.theaimsgroup.com/?l=linux-kernel&m=117206799914351&w=2
+
+Resolves BZ 229483.
+
+P.
+
+--- linux-2.6.20.ia64.orig/drivers/usb/mon/mon_bin.c	2007-02-19 09:24:19.000000000 -0500
++++ linux-2.6.20.ia64/drivers/usb/mon/mon_bin.c	2007-02-19 10:33:13.000000000 -0500
+@@ -1165,7 +1165,7 @@ err_dev:
+ 	return rc;
+ }
+ 
+-void __exit mon_bin_exit(void)
++void mon_bin_exit(void)
+ {
+ 	cdev_del(&mon_bin_cdev);
+ 	unregister_chrdev_region(mon_bin_dev0, MON_BIN_MAX_MINOR);
+--- linux-2.6.20.ia64.orig/drivers/usb/mon/mon_text.c	2007-02-19 09:24:19.000000000 -0500
++++ linux-2.6.20.ia64/drivers/usb/mon/mon_text.c	2007-02-19 10:33:41.000000000 -0500
+@@ -520,7 +520,7 @@ int __init mon_text_init(void)
+ 	return 0;
+ }
+ 
+-void __exit mon_text_exit(void)
++void mon_text_exit(void)
+ {
+ 	debugfs_remove(mon_dir);
+ }
+--- linux-2.6.20.ia64.orig/drivers/usb/mon/usb_mon.h	2007-02-19 09:24:19.000000000 -0500
++++ linux-2.6.20.ia64/drivers/usb/mon/usb_mon.h	2007-02-21 09:08:18.000000000 -0500
+@@ -57,9 +57,9 @@ void mon_text_del(struct mon_bus *mbus);
+ // void mon_bin_add(struct mon_bus *);
+ 
+ int __init mon_text_init(void);
+-void __exit mon_text_exit(void);
++void mon_text_exit(void);
+ int __init mon_bin_init(void);
+-void __exit mon_bin_exit(void);
++void mon_bin_exit(void);
+ 
+ /*
+  * DMA interface.