rpms/kernel/devel kernel.spec,1.1753,1.1754

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24906

Modified Files:
	kernel.spec 
Log Message:
* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
- fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -p -r1.1753 -r1.1754
--- kernel.spec	28 Aug 2009 22:40:28 -0000	1.1753
+++ kernel.spec	30 Aug 2009 05:25:01 -0000	1.1754
@@ -670,8 +670,7 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1515: linux-2.6.31-lirc.patch
-Patch1516: lirc_streamzap-buffer-rework.patch
+Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
 Patch1518: hid-ignore-all-recent-imon-devices.patch
 
@@ -1287,9 +1286,7 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.31-lirc.patch
-# should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
-ApplyPatch lirc_streamzap-buffer-rework.patch
+ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 # tell usbhid to ignore all imon devices (sent upstream 2009.07.31)
@@ -2007,6 +2004,9 @@ fi
 # and build.
 
 %changelog
+* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com>
+- fix lirc_imon oops on older devices w/o tx ctrl ep (#520008)
+
 * Fri Aug 28 2009 Eric Paris <eparis at redhat.com> 2.6.31-0.190.rc8
 - fix inotify length accounting and send inotify events