summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-09-15 08:37:37 -0400
committerChuck Ebbert <cebbert@redhat.com>2010-09-15 08:37:37 -0400
commit6d1d3d62c35ee70d2e33dab6e732eaee7439dfca (patch)
treedddb441cb0322b8cd22471b7493ffcb3e792f52c
parentdd2e67f6a935cd31065f1b78dbfa0c33042c2abd (diff)
downloadkernel-6d1d3d62c35ee70d2e33dab6e732eaee7439dfca.tar.gz
kernel-6d1d3d62c35ee70d2e33dab6e732eaee7439dfca.tar.xz
kernel-6d1d3d62c35ee70d2e33dab6e732eaee7439dfca.zip
Linux 2.6.36-rc4-git2
Fix up add-appleir-usb-driver.patch after HID core changes.
-rw-r--r--add-appleir-usb-driver.patch2
-rw-r--r--kernel.spec8
-rw-r--r--sources2
3 files changed, 8 insertions, 4 deletions
diff --git a/add-appleir-usb-driver.patch b/add-appleir-usb-driver.patch
index 210f289f8..61edb8061 100644
--- a/add-appleir-usb-driver.patch
+++ b/add-appleir-usb-driver.patch
@@ -116,9 +116,9 @@ index baa25ad..abc5bd7 100644
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
- { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT)},
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
+ { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 11af537..360a5ca 100644
--- a/drivers/hid/hid-ids.h
diff --git a/kernel.spec b/kernel.spec
index 8661b2f58..364a4068c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 21
+%global baserelease 22
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1904,6 +1904,10 @@ fi
# || ||
%changelog
+* Wed Sep 15 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.22.rc4.git2
+- Linux 2.6.36-rc4-git2
+- Fix up add-appleir-usb-driver.patch after HID core changes.
+
* Mon Sep 13 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.21.rc4.git1
- Linux 2.6.36-rc4-git1
- Add preliminary support for Wacom Bamboo pen and touch devices.
diff --git a/sources b/sources
index 7ddea43d8..35c4a6fc6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
54d5d05eb33085ab5c4a8e467317c8bc patch-2.6.36-rc4.bz2
-1b39a1d9b3bf5a3925608071718c341f patch-2.6.36-rc4-git1.bz2
+0a1f90a1a16939c012ddadcb7b51f538 patch-2.6.36-rc4-git2.bz2