rpms/kernel/devel linux-2.6-ms-wireless-receiver.patch,1.1,1.2

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20778

Modified Files:
	linux-2.6-ms-wireless-receiver.patch 
Log Message:
fix some vim droppings

linux-2.6-ms-wireless-receiver.patch:

Index: linux-2.6-ms-wireless-receiver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ms-wireless-receiver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ms-wireless-receiver.patch	14 Mar 2008 15:04:02 -0000	1.1
+++ linux-2.6-ms-wireless-receiver.patch	14 Mar 2008 16:06:34 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up linux-2.6.24.noarch/include/linux/hid.h.jx linux-2.6.24.noarch/include/linux/hid.h
 --- linux-2.6.24.noarch/include/linux/hid.h.jx	2008-03-14 10:49:43.000000000 -0400
 +++ linux-2.6.24.noarch/include/linux/hid.h	2008-03-14 10:56:08.000000000 -0400
-@@ -296,6 +296,7 @@ struct hid_item {
+@@ -296,6 +296,7 @@
  #define HID_QUIRK_RDESC_MACBOOK_JIS		0x00000010
  #define HID_QUIRK_RDESC_BUTTON_CONSUMER		0x00000020
  #define HID_QUIRK_RDESC_SAMSUNG_REMOTE		0x00000040
@@ -9,10 +9,9 @@
  
  /*
   * This is the global environment of the parser. This information is
-diff -up linux-2.6.24.noarch/drivers/hid/usbhid/hid-quirks.c.jx linux-2.6.24.noarch/drivers/hid/usbhid/hid-quirks.c
 --- linux-2.6.24.noarch/drivers/hid/usbhid/hid-quirks.c.jx	2008-03-14 10:49:43.000000000 -0400
 +++ linux-2.6.24.noarch/drivers/hid/usbhid/hid-quirks.c	2008-03-14 10:57:10.000000000 -0400
-@@ -583,7 +583,7 @@ static const struct hid_blacklist {
+@@ -583,7 +583,7 @@
  	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
  
  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K, HID_QUIRK_MICROSOFT_KEYS },
@@ -21,7 +20,7 @@
  
  	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },
  
-@@ -1085,6 +1085,28 @@ static void usbhid_fixup_button_consumer
+@@ -1085,6 +1085,28 @@
  	}
  }
  
@@ -39,8 +38,8 @@
 +	                 && rdesc[355] == 0x2a
 +			 && rdesc[557] == 0x19
 +			 && rdesc[559] == 0x29) {
-+		printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report \
-+escriptor\n"); +		rdesc[284] = rdesc[304] = rdesc[558] = 0x35;
++		printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");
++		rdesc[284] = rdesc[304] = rdesc[558] = 0x35;
 +		rdesc[352] = 0x36;
 +		rdesc[286] = rdesc[355] = 0x46;
 +		rdesc[306] = rdesc[559] = 0x45;
@@ -50,7 +49,7 @@
  static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
  {
  	if ((quirks & HID_QUIRK_RDESC_CYMOTION))
-@@ -1108,6 +1130,8 @@ static void __usbhid_fixup_report_descri
+@@ -1108,6 +1130,8 @@
  	if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
  		usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);