diff options
| -rw-r--r-- | PATCHCFG | 9 | ||||
| -rw-r--r-- | patches/satanv.patch | 16 |
2 files changed, 3 insertions, 22 deletions
@@ -3,14 +3,14 @@ SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2" # Original source directory SRCORIG="linux-2.6.28" # Our source directory -SRCNAME="linux-2.6.28.6-ARCH" +SRCNAME="linux-2.6.28.7-ARCH" # Patches: # URL%patchlevel # or # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( # add upstream patch from 2.6.27 series - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.6.bz2%1 + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.7.bz2%1 # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -21,9 +21,6 @@ PATCHES=( # fix http://bugs.archlinux.org/taks/13212 elgatedvb-patch%1 - # fix http://bugs.archlinux.org/tasks/12361 - satanv.patch%1 - # add custom acpi dsdt patch, in reference to: # http://gaugusch.at/kernel.shtml # http://acpi.sourceforge.net @@ -49,7 +46,7 @@ PATCHES=( lhash-2.6.24.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.28.6-1-ARCH" +PATCHNAME="patch-2.6.28.7-1-ARCH" # Run this before applying patches pre_apply() { diff --git a/patches/satanv.patch b/patches/satanv.patch deleted file mode 100644 index 808d9a6..0000000 --- a/patches/satanv.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c -index 444af04..667d1ab 100644 ---- a/drivers/ata/sata_nv.c -+++ b/drivers/ata/sata_nv.c -@@ -430,10 +430,9 @@ static struct ata_port_operations nv_generic_ops = { - * Debounce with hotplug timing and request follow-up SRST. - */ - static struct ata_port_operations nv_nf2_ops = { -- .inherits = &nv_common_ops, -+ .inherits = &nv_generic_ops, - .freeze = nv_nf2_freeze, - .thaw = nv_nf2_thaw, -- .hardreset = nv_noclassify_hardreset, - }; - - /* For initial probing after boot and hot plugging, hardreset mostly |