r1461 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-08-28 17:36:59 -0600 (Sat, 28 Aug 2004)
New Revision: 1461

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
Log:
add the legendary missing ide-probe.c patch


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-28 21:29:52 UTC (rev 1460)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-28 23:36:59 UTC (rev 1461)
@@ -1,3 +1,12 @@
+kernel-source-2.4.27 (2.4.27-5) unstable; urgency=high
+
+  * Fix a goofup in debian/apply that didn't really affect normal users.
+  * 070_ide_scan_pcibus.diff: Add this very crucial hunk of code that was
+    missed while exploding the monolithic patchset into small diffs.
+    (Closes: #266538, #266510)
+
+ -- Joshua Kwan <joshk@triplehelix.org>  Sat, 28 Aug 2004 15:56:03 -0700
+
 kernel-source-2.4.27 (2.4.27-4) unstable; urgency=high
 
   * 065_copy_user_parens.diff: This patch is cset 1.1447.4.7 from linux-2.4,

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff	2004-08-28 21:29:52 UTC (rev 1460)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff	2004-08-28 23:36:59 UTC (rev 1461)
@@ -0,0 +1,22 @@
+diff -urN kernel-source-2.4.26/drivers/ide/ide-probe.c kernel-source-2.4.26-1/drivers/ide/ide-probe.c
+--- kernel-source-2.4.26/drivers/ide/ide-probe.c	2004-04-14 23:05:29.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/ide/ide-probe.c	2004-04-17 14:23:47.000000000 +1000
+@@ -1425,12 +1425,16 @@
+ 
+ 	if (ideprobe_done)
+     		return -EBUSY;
+-	
++
++	ide_xlate_1024_hook = ide_xlate_1024;
++#ifdef CONFIG_BLK_DEV_IDEPCI
++	ide_scan_pcibus();
++#endif /* CONFIG_BLK_DEV_IDEPCI */
+ 	for (index = 0; index < MAX_HWIFS; ++index)
+ 		ide_unregister(index);
+ 	ideprobe_init();
+ 	create_proc_ide_interfaces();
+-	ide_xlate_1024_hook = ide_xlate_1024;
++	ide_driver_module(1);
+ 	ideprobe_done++;
+ 	return 0;
+ }

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5	2004-08-28 21:29:52 UTC (rev 1460)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5	2004-08-28 23:36:59 UTC (rev 1461)
@@ -0,0 +1 @@
++ 070_ide_scan_pcibus.diff