[kernel] r14710 - in dists/lenny/linux-2.6/debian: . patches/features/x86 patches/series

[Dann Frazier]

Author: dannf
Date: Tue Dec  1 17:42:15 2009
New Revision: 14710

Log:
hpilo: new PCI ID (Closes: #559064)

Added:
   dists/lenny/linux-2.6/debian/patches/features/x86/hpilo-new-pci-device.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/21

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Tue Dec  1 05:49:18 2009	(r14709)
+++ dists/lenny/linux-2.6/debian/changelog	Tue Dec  1 17:42:15 2009	(r14710)
@@ -26,6 +26,7 @@
     (CVE-2009-3889)
   * isdn: hfc_usb: Fix read buffer overflow (CVE-2009-4005)
   * fuse: prevent fuse_put_request on invalid pointer (CVE-2009-4021)
+  * hpilo: new PCI ID (Closes: #559064)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 24 Oct 2009 23:45:45 +0100
 

Added: dists/lenny/linux-2.6/debian/patches/features/x86/hpilo-new-pci-device.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/x86/hpilo-new-pci-device.patch	Tue Dec  1 17:42:15 2009	(r14710)
@@ -0,0 +1,35 @@
+commit 31d8b5631f095cb7100cfccc95c801a2547ffe2b
+Author: David Altobelli <david.altobelli at hp.com>
+Date:   Fri Feb 27 14:03:09 2009 -0800
+
+    hpilo: new pci device
+    
+    Future iLO devices will have an HP vendor id.
+    
+    Signed-off-by: David Altobelli <david.altobelli at hp.com>
+    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at hp.com>
+
+diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
+index f26667a..cf99185 100644
+--- a/drivers/misc/hpilo.c
++++ b/drivers/misc/hpilo.c
+@@ -710,6 +710,7 @@ out:
+ 
+ static struct pci_device_id ilo_devices[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB204) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3307) },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(pci, ilo_devices);
+@@ -758,7 +759,7 @@ static void __exit ilo_exit(void)
+ 	class_destroy(ilo_class);
+ }
+ 
+-MODULE_VERSION("0.05");
++MODULE_VERSION("0.05.debian1");
+ MODULE_ALIAS(ILO_NAME);
+ MODULE_DESCRIPTION(ILO_NAME);
+ MODULE_AUTHOR("David Altobelli <david.altobelli at hp.com>");

Modified: dists/lenny/linux-2.6/debian/patches/series/21
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/21	Tue Dec  1 05:49:18 2009	(r14709)
+++ dists/lenny/linux-2.6/debian/patches/series/21	Tue Dec  1 17:42:15 2009	(r14710)
@@ -33,3 +33,4 @@
 + bugfix/all/megaraid_sas-fix-sysfs-dbg_lvl-permissions.patch
 + bugfix/all/isdn-hfc_usb-fix-read-buffer-overflow.patch
 + bugfix/all/fuse-prevent-fuse_put_request-on-invalid-pointer.patch
++ features/x86/hpilo-new-pci-device.patch