Author: maks-guest
Date: Fri Jan  5 00:12:08 2007
New Revision: 8099

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/i386-net-tulip-rm-dup-pci-ids.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9-extra
Log:
rm dup pci ids of tulip on i386


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog        (original)
+++ dists/sid/linux-2.6/debian/changelog        Fri Jan  5 00:12:08 2007
@@ -129,6 +129,8 @@
     - r8169: remove extraneous Cmd{Tx/Rx}Enb write
   * sound: hda: detect ALC883 on MSI K9A Platinum motherboards (MS-7280)
     patch from Leonard Norrgard <[EMAIL PROTECTED]>
+  * tulip: Add i386 specific patch to remove duplicate pci ids. 
+    Thanks Jurij Smakov <[EMAIL PROTECTED]> (closes: #334104)
 
   [ Jurij Smakov ]
   * Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
@@ -140,7 +142,7 @@
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
 
- -- dann frazier <[EMAIL PROTECTED]>  Wed,  3 Jan 2007 18:01:13 -0700
+ -- maximilian attems <[EMAIL PROTECTED]>  Fri,  5 Jan 2007 00:02:29 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: 
dists/sid/linux-2.6/debian/patches/bugfix/i386-net-tulip-rm-dup-pci-ids.patch
==============================================================================
--- (empty file)
+++ 
dists/sid/linux-2.6/debian/patches/bugfix/i386-net-tulip-rm-dup-pci-ids.patch   
    Fri Jan  5 00:12:08 2007
@@ -0,0 +1,37 @@
+From [EMAIL PROTECTED] Fri Jan 13 17:20:04 2006
+Message-Id: <[EMAIL PROTECTED]>
+Subject: + tulip-remove-duplicate-pci-ids.patch added to -mm tree
+To: [EMAIL PROTECTED], [EMAIL PROTECTED], [email protected]
+From: [EMAIL PROTECTED]
+Date: Wed, 11 Jan 2006 20:06:54 -0800
+
+tulip driver advertises support for non-working id
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=334104
+
+It looks like tulip and dmfe have some identical PCI IDs in their lists of
+supported devices, which, I believe, should not normally happen.  Attached
+patch removes the PCI IDs handled by dmfe driver from tulip.
+
+Signed-off-by: Jurij Smakov <[EMAIL PROTECTED]>
+Signed-off-by: maximilian attems <[EMAIL PROTECTED]>
+Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
+---
+
+ drivers/net/tulip/tulip_core.c |    2 --
+ 1 files changed, 2 deletions(-)
+
+diff -puN drivers/net/tulip/tulip_core.c~tulip-remove-duplicate-pci-ids 
drivers/net/tulip/tulip_core.c
+--- devel/drivers/net/tulip/tulip_core.c~tulip-remove-duplicate-pci-ids        
2006-01-11 20:06:50.000000000 -0800
++++ devel-akpm/drivers/net/tulip/tulip_core.c  2006-01-11 20:06:50.000000000 
-0800
+@@ -223,8 +223,6 @@ static struct pci_device_id tulip_pci_tb
+       { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+       { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
+       { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 },
+-      { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
+-      { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
+       { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+       { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
+       { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+_
+
+

Modified: dists/sid/linux-2.6/debian/patches/series/9-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9-extra   (original)
+++ dists/sid/linux-2.6/debian/patches/series/9-extra   Fri Jan  5 00:12:08 2007
@@ -12,3 +12,4 @@
 + m68k-atari-ide.patch m68k
 + m68k-atari-ethernec-update.patch m68k
 + m68k-atari-atakeyb-switches.patch m68k
++ bugfix/i386-net-tulip-rm-dup-pci-ids.patch i386

_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

Reply via email to