rpms/kernel/devel kernel.spec, 1.124, 1.125 linux-2.6-lirc.patch, 1.1, 1.2

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv741

Modified Files:
	kernel.spec linux-2.6-lirc.patch 
Log Message:
Fix some minor issues with lirc patch (like, it not building on ppc64...)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kernel.spec	27 Aug 2007 21:23:08 -0000	1.124
+++ kernel.spec	27 Aug 2007 22:19:13 -0000	1.125
@@ -1777,7 +1777,7 @@
 
 %changelog
 * Mon Aug 27 2007 Jarod Wilson <jwilson at redhat.com>
-- Add lirc.org drivers to kernel build
+- Add lirc.org drivers
 
 * Mon Aug 27 2007 Kristian Høgsberg <krh at redhat.com>
 - Add patch from Stefan Richter to support multi-lun SBP-2 devices (#242254).

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-lirc.patch	27 Aug 2007 21:23:08 -0000	1.1
+++ linux-2.6-lirc.patch	27 Aug 2007 22:19:13 -0000	1.2
@@ -1245,7 +1245,7 @@
 index 0000000..c692b77
 --- /dev/null
 +++ b/drivers/input/lirc/kcompat.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,99 @@
 +/*      $Id$      */
 +
 +#ifndef _KCOMPAT_H
@@ -1323,13 +1323,6 @@
 +#endif
 +#endif
 +
-+#if !defined(local_irq_save)
-+#define local_irq_save(flags) do{ save_flags(flags);cli(); } while(0)
-+#endif
-+#if !defined(local_irq_restore)
-+#define local_irq_restore(flags) do{ restore_flags(flags); } while(0)
-+#endif
-+
 +/*************************** I2C specific *****************************/
 +#include <linux/i2c.h>
 +
@@ -2783,7 +2776,7 @@
 +static struct pci_dev *do_pci_probe(void)
 +{
 +	struct pci_dev *my_dev;
-+	my_dev = pci_find_device(PCI_VENDOR_ID_ATI,
++	my_dev = pci_get_device(PCI_VENDOR_ID_ATI,
 +				 PCI_DEVICE_ID_ATI_264VT, NULL);
 +	if (my_dev) {
 +		printk(KERN_ERR "ATIR: Using device: %s\n",