r2648 - 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:07:23 +0100 (Tue, 08 Mar 2005)
New Revision: 2648

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/modular-ide-pnp.dpatch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
fix modular-ide-pnp.dpatch


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 14:04:25 UTC (rev 2647)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 14:07:23 UTC (rev 2648)
@@ -11,7 +11,8 @@
 
   * Add newer scsi-changer patch (Maximilian Attems)
 
-  * Rework drivers-net-tg3-readd.dpatch (Maximilian Attems)
+  * Rework drivers-net-tg3-readd.dpatch, modular-ide-pnp.dpatch 
+    (Maximilian Attems)
 
  -- Sven Luther <luther@debian.org>  Mon,  7 Mar 2005 14:56:32 +0100
 

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 14:04:25 UTC (rev 2647)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 14:07:23 UTC (rev 2648)
@@ -1,4 +1,3 @@
-# + modular-ide-pnp.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/modular-ide-pnp.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide-pnp.dpatch	2005-03-08 14:04:25 UTC (rev 2647)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/modular-ide-pnp.dpatch	2005-03-08 14:07:23 UTC (rev 2648)
@@ -11,7 +11,7 @@
 @DPATCH@
 --- 1.49/drivers/ide/Kconfig	2004-06-18 08:43:53 +02:00
 +++ edited/drivers/ide/Kconfig	2004-06-19 12:25:46 +02:00
-@@ -305,7 +305,7 @@
+@@ -316,7 +316,7 @@
  	  Otherwise say N.
  
  config BLK_DEV_IDEPNP
@@ -66,7 +66,7 @@
 +MODULE_LICENSE("GPL");
 --- 1.150/drivers/ide/ide.c	2004-06-15 18:31:12 +02:00
 +++ edited/drivers/ide/ide.c	2004-06-19 12:29:44 +02:00
-@@ -2003,7 +2003,7 @@
+@@ -1954,7 +1954,7 @@
  	return 1;
  }
  

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 14:04:25 UTC (rev 2647)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 14:07:23 UTC (rev 2648)
@@ -47,3 +47,4 @@
 + docbook-move-kernel-doc-comment-next-to-function.dpatch
 + drivers-add-scsi_changer.dpatch
 + drivers-net-tg3-readd.dpatch
++ modular-ide-pnp.dpatch