[kernel] r7213 - in dists/sid/linux-2.6/debian: . arch/i386 patches patches/series

[Dann Frazier]

Author: dannf
Date: Mon Aug 21 00:29:13 2006
New Revision: 7213

Added:
   dists/sid/linux-2.6/debian/patches/macbook-usbhid-ids.patch
Modified:
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/7

Log:
* Include module.lds in headers package if it exists. (closes: #342246)
* Add Apple MacBook product IDs to usbhid and set
  CONFIG_USB_HIDINPUT_POWERBOOK=y on i386 and amd64. (closes: #383620)

Modified: dists/sid/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	Mon Aug 21 00:29:13 2006
@@ -1288,6 +1288,7 @@
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_KBD=m

Modified: dists/sid/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config	Mon Aug 21 00:29:13 2006
@@ -1542,6 +1542,7 @@
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HIDINPUT_POWERBOOK=y
 # CONFIG_HID_FF is not set
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_KBD=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Aug 21 00:29:13 2006
@@ -27,9 +27,11 @@
   * Activate CONFIG_R8169_VLAN on amd64. (closes: #383707)
 
   [ dann frazier ]
-  * Include module.lds in headers package if it exists. Closes: #342246
+  * Include module.lds in headers package if it exists. (closes: #342246)
+  * Add Apple MacBook product IDs to usbhid and set
+    CONFIG_USB_HIDINPUT_POWERBOOK=y on i386 and amd64. (closes: #383620)
 
- -- dann frazier <dannf at debian.org>  Sun, 20 Aug 2006 13:27:58 -0600
+ -- dann frazier <dannf at debian.org>  Sun, 20 Aug 2006 14:09:30 -0600
 
 linux-2.6 (2.6.17-6) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/macbook-usbhid-ids.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/macbook-usbhid-ids.patch	Mon Aug 21 00:29:13 2006
@@ -0,0 +1,27 @@
+From: Rene Rebe <rene at exactcode.de>
+Date: Sun, 4 Jun 2006 09:39:09 +0000 (+0200)
+Subject: [PATCH] USB: Add Apple MacBook product IDs to usbhid
+X-Git-Tag: v2.6.18-rc1
+X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=5c218e3b86510f9685bfae5b0d2d7cc8468056c1
+
+[PATCH] USB: Add Apple MacBook product IDs to usbhid
+
+This adds the Apple MacBook product IDs for the Fn translation
+to the usbhid.
+
+Signed-off-by: Rene Rebe <rene at exactcode.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+--- a/drivers/usb/input/hid-core.c
++++ b/drivers/usb/input/hid-core.c
+@@ -1693,6 +1693,9 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },
+ 	{ USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN },
+ 	{ USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },
+ 	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
+ 	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/7	(original)
+++ dists/sid/linux-2.6/debian/patches/series/7	Mon Aug 21 00:29:13 2006
@@ -1 +1,2 @@
 + 2.6.17.9
++ macbook-usbhid-ids.patch