rpms/kernel/F-10 kernel.spec, 1.1206.2.48, 1.1206.2.49 linux-2.6.27-lirc.patch, 1.1, 1.1.10.1

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18030

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec linux-2.6.27-lirc.patch 
Log Message:
* Tue Mar 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.27.20-170.2.49.rc1
- Always default to softcarrier=1 in lirc_serial (#479576)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.48
retrieving revision 1.1206.2.49
diff -u -r1.1206.2.48 -r1.1206.2.49
--- kernel.spec	16 Mar 2009 12:13:26 -0000	1.1206.2.48
+++ kernel.spec	17 Mar 2009 15:11:07 -0000	1.1206.2.49
@@ -1954,6 +1954,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Mar 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.27.20-170.2.49.rc1
+- Always default to softcarrier=1 in lirc_serial (#479576)
+
 * Mon Mar 16 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.20-170.2.48.rc1
 - Build VIA Padlock driver on PAE kernels (#490405)
 - Padlock cannot be built for x86_64.

linux-2.6.27-lirc.patch:

Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Attic/linux-2.6.27-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- linux-2.6.27-lirc.patch	21 Oct 2008 21:08:57 -0000	1.1
+++ linux-2.6.27-lirc.patch	17 Mar 2009 15:11:08 -0000	1.1.10.1
@@ -9786,7 +9786,7 @@
 diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c
 --- linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c	2008-10-21 16:03:34.000000000 -0400
-@@ -0,0 +1,1312 @@
+@@ -0,0 +1,1308 @@
 +/****************************************************************************
 + ** lirc_serial.c ***********************************************************
 + ****************************************************************************
@@ -9944,11 +9944,7 @@
 +static int ioshift = LIRC_IOSHIFT;
 +#endif
 +
-+#ifdef LIRC_SERIAL_SOFTCARRIER
 +static int softcarrier = 1;
-+#else
-+static int softcarrier;
-+#endif
 +
 +static int share_irq;
 +static int debug;