r2647 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: 2005-03-08 15:04:25 +0100 (Tue, 08 Mar 2005)
New Revision: 2647

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
fig tg3-readd


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 13:54:32 UTC (rev 2646)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 14:04:25 UTC (rev 2647)
@@ -11,6 +11,8 @@
 
   * Add newer scsi-changer patch (Maximilian Attems)
 
+  * Rework drivers-net-tg3-readd.dpatch (Maximilian Attems)
+
  -- Sven Luther <luther@debian.org>  Mon,  7 Mar 2005 14:56:32 +0100
 
 kernel-source-2.6.10 (2.6.10-6) UNRELEASED; urgency=low

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 13:54:32 UTC (rev 2646)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 14:04:25 UTC (rev 2647)
@@ -1,5 +1,4 @@
 # + modular-ide-pnp.dpatch			# OK, needs rediff
-# + drivers-net-tg3-readd.dpatch		# OK, needs rediff
 # + x86-i486_emu.dpatch				# OK, needs rediff
 
 # + modular-ide.dpatch 				# FAILED

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch	2005-03-08 13:54:32 UTC (rev 2646)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch	2005-03-08 14:04:25 UTC (rev 2647)
@@ -6,7 +6,7 @@
 
 --- orig/drivers/net/Kconfig	2004-08-14 03:27:18.000000000 -0400
 +++ mod/drivers/net/Kconfig	2004-08-14 03:27:34.000000000 -0400
-@@ -2125,6 +2125,7 @@
+@@ -2075,6 +2075,7 @@
  config TIGON3
  	tristate "Broadcom Tigon3 support"
  	depends on PCI

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 13:54:32 UTC (rev 2646)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 14:04:25 UTC (rev 2647)
@@ -46,3 +46,4 @@
 + docbook-fix-function-parameter-descriptin-in-fbmem.dpatch
 + docbook-move-kernel-doc-comment-next-to-function.dpatch
 + drivers-add-scsi_changer.dpatch
++ drivers-net-tg3-readd.dpatch