Backport ALPS touchpad patches from input/next branch (rhbz #590880)

This commit is contained in:
Josh Boyer 2011-12-02 15:57:37 -05:00
parent f7c8fbc812
commit 9f33e8dbe2
2 changed files with 1870 additions and 2 deletions

1861
alps.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 3 %global baserelease 4
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -714,6 +714,9 @@ Patch21091: pci-Rework-ASPM-disable-code.patch
#rhbz 753236 #rhbz 753236
Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
#rhbz 590880
Patch21030: alps.patch
%endif %endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1372,6 +1375,9 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch
#rhbz 753236 #rhbz 753236
ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
#rhbz 590880
ApplyPatch alps.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
%endif %endif
@ -2171,7 +2177,8 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com> * Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com> 3.2.0-0.rc4.git1.4.fc17
- Backport ALPS touchpad patches from input/next branch (rhbz #590880)
- Apply patch from John Linville to reverse modules-extra dependency order - Apply patch from John Linville to reverse modules-extra dependency order
- Put ssb.ko back in the main kernel package - Put ssb.ko back in the main kernel package