rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

drop qcserial 'compile fix' that was just duplicating an include.

Browse Source
This commit is contained in:
Dave Jones 2011-06-17 14:23:37 -04:00
parent 30be1b3c22
commit 975b3750e0
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel.spec
View File

@ -618,7 +618,6 @@ Patch09: linux-2.6-upstream-reverts.patch
# Git trees. # Git trees.
# Standalone patches # Standalone patches
Patch20: linux-2.6-hotfixes.patch
Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
@ -1135,7 +1134,6 @@ ApplyOptionalPatch linux-2.6-compile-fixes.patch
# revert patches from upstream that conflict or that we get via other means # revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
ApplyPatch linux-2.6-hotfixes.patch
# Architecture patches # Architecture patches
# x86(-64) # x86(-64)
@ -1883,6 +1881,9 @@ fi
# and build. # and build.
%changelog %changelog
* Fri Jun 17 2011 Dave Jones <davej@redhat.com>
- drop qcserial 'compile fix' that was just duplicating an include.
* Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com> * Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com>
- linux-2.6-defaults-pci_no_msi.patch: drop, haven't toggled the default - linux-2.6-defaults-pci_no_msi.patch: drop, haven't toggled the default
in many moons. in many moons.

15
linux-2.6-hotfixes.patch
View File

@ -1,15 +0,0 @@
fixes:
implicit declaration of function kzalloc
--- linux-2.6.34.noarch/drivers/usb/serial/qcserial.c~ 2010-06-08 15:19:41.000000000 -0400
+++ linux-2.6.34.noarch/drivers/usb/serial/qcserial.c 2010-06-08 15:19:47.000000000 -0400
@@ -11,6 +11,7 @@
*
*/
+#include <linux/slab.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/usb.h>