diff options
| author | Dave Jones <davej@redhat.com> | 2011-06-17 14:23:37 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-06-17 14:23:37 -0400 |
| commit | 975b3750e0ce1b9fef02ac02444136ed6dee9f0e (patch) | |
| tree | b4b2d111a79fa6e7f938f3624b4eaa39c9620b5e | |
| parent | 30be1b3c22a554fa3b4aac4b086aabb8da8d0047 (diff) | |
| download | kernel-975b3750e0ce1b9fef02ac02444136ed6dee9f0e.tar.gz kernel-975b3750e0ce1b9fef02ac02444136ed6dee9f0e.tar.xz kernel-975b3750e0ce1b9fef02ac02444136ed6dee9f0e.zip | |
drop qcserial 'compile fix' that was just duplicating an include.
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | linux-2.6-hotfixes.patch | 15 |
2 files changed, 3 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec index 88afe8a9e..83833c355 100644 --- a/kernel.spec +++ b/kernel.spec @@ -618,7 +618,6 @@ Patch09: linux-2.6-upstream-reverts.patch # Git trees. # Standalone patches -Patch20: linux-2.6-hotfixes.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 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R -ApplyPatch linux-2.6-hotfixes.patch # Architecture patches # x86(-64) @@ -1883,6 +1881,9 @@ fi # and build. %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> - linux-2.6-defaults-pci_no_msi.patch: drop, haven't toggled the default in many moons. diff --git a/linux-2.6-hotfixes.patch b/linux-2.6-hotfixes.patch deleted file mode 100644 index 494947322..000000000 --- a/linux-2.6-hotfixes.patch +++ /dev/null @@ -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> - - |