core/linux-kirkwood to 3.10.5; remove obsole patch as it was committed into mainline

This commit is contained in:
moonman 2013-08-05 21:57:05 -06:00
parent b3e7d450cb
commit 0ad5137e9f
2 changed files with 3 additions and 15 deletions

View file

@ -7,7 +7,7 @@ pkgbase=linux-kirkwood
pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
#pkgname=linux-test # Build kernel with a different name
_kernelname=${pkgname#linux}
_basekernel=3.10.4
_basekernel=3.10.5
pkgver=${_basekernel}
pkgrel=1
cryptover=1.6
@ -29,7 +29,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch")
md5sums=('0378156d0a4ebf155d083531c3cb3826'
md5sums=('853d4bca2752a7ec6ca11a14d557d691'
'c84965943b804f763f892e4f704ba73b'
'f5d3635da03cb45904bedd69b47133de'
'eb059648b877ab24d3689c6c3ce173ed'
@ -64,10 +64,8 @@ msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
# FS#26528
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
msg2 "Add Arch Linux ARM patch for ARMv5te plug computers,"
msg2 "requested additional support, mach-types"
msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
patch -Np1 -i "${srcdir}/archlinuxarm.patch"
patch -Np1 -i "${srcdir}/support.patch"
cp "${srcdir}/mach-types" arch/arm/tools
msg2 "Add BFQ patches"

View file

@ -1,10 +0,0 @@
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3247,6 +3247,7 @@
{ USB_DEVICE(0x0711, 0x0903) },
{ USB_DEVICE(0x0711, 0x0918) },
{ USB_DEVICE(0x0711, 0x0920) },
+ { USB_DEVICE(0x0711, 0x0950) },
{ USB_DEVICE(0x182d, 0x021c) },
{ USB_DEVICE(0x182d, 0x0269) },
{ }