[kernel] r17058 - in dists/squeeze/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Mar 12 20:21:57 2011
New Revision: 17058

Log:
tulip: Add support for Microsoft MN-120 PCMCIA network card (Closes: #617917)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/tulip-add-support-for-Microsoft-MN-120-PCMCIA.patch
   dists/squeeze/linux-2.6/debian/patches/series/32
Modified:
   dists/squeeze/linux-2.6/debian/changelog

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Mar 12 19:45:33 2011	(r17057)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Mar 12 20:21:57 2011	(r17058)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.32-32) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * tulip: Add support for Microsoft MN-120 PCMCIA network card
+    (Closes: #617917)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 12 Mar 2011 20:20:58 +0000
+
 linux-2.6 (2.6.32-31) stable; urgency=low
 
   [ Ian Campbell ]

Added: dists/squeeze/linux-2.6/debian/patches/features/all/tulip-add-support-for-Microsoft-MN-120-PCMCIA.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/tulip-add-support-for-Microsoft-MN-120-PCMCIA.patch	Sat Mar 12 20:21:57 2011	(r17058)
@@ -0,0 +1,35 @@
+From: Ron Murray <rjmx at rjmx.net>
+Date: Tue, 19 Jan 2010 08:02:48 +0000
+Subject: [PATCH] Please add support for Microsoft MN-120 PCMCIA network card
+
+commit 60abe78279568a7109db2bcbc71131766a91c2e5 upstream.
+
+Please add support for Microsoft MN-120 PCMCIA network card. It's an
+old card, I know, but adding support is very easy. You just need to
+get tulip_core.c to recognise its vendor/device ID.
+
+Patch for kernel 2.6.32.4 (and many previous) attached.
+
+ .....Ron Murray
+
+Signed-off-by: Ron Murray <rjmx at rjmx.net>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/tulip/tulip_core.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
+index 88bf54f..43b1fcb 100644
+--- a/drivers/net/tulip/tulip_core.c
++++ b/drivers/net/tulip/tulip_core.c
+@@ -249,6 +249,7 @@ static struct pci_device_id tulip_pci_tbl[] = {
+ 	{ 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+ 	{ 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */
+ 	{ 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */
++	{ 0x1414, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Microsoft MN-120 */
+ 	{ 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+ 	{ } /* terminate list */
+ };
+-- 
+1.7.4.1
+

Added: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Sat Mar 12 20:21:57 2011	(r17058)
@@ -0,0 +1 @@
++ features/all/tulip-add-support-for-Microsoft-MN-120-PCMCIA.patch