r1548 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-09-04 15:49:57 -0600 (Sat, 04 Sep 2004)
New Revision: 1548

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/082_global_scan_direction.diff
Log:
applied by hand


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/082_global_scan_direction.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/082_global_scan_direction.diff	2004-09-04 21:44:10 UTC (rev 1547)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/082_global_scan_direction.diff	2004-09-04 21:49:57 UTC (rev 1548)
@@ -4,30 +4,8 @@
 # description: allow setup-pci.c to use ide_scan_direction
 # revision date: 2004-09-04
 
---- linux-2.4.27/drivers/ide/ide.c	2004-08-08 01:26:04.000000000 +0200
-+++ linux-2.4.27+debian/drivers/ide/ide.c	2004-08-11 23:52:58.000000000 +0200
-@@ -172,7 +172,7 @@
- static int system_bus_speed;	/* holds what we think is VESA/PCI bus speed */
- static int initializing;	/* set while initializing built-in drivers */
- 
--static int ide_scan_direction;	/* THIS was formerly 2.2.x pci=reverse */
-+int ide_scan_direction;		/* THIS was formerly 2.2.x pci=reverse */
- 
- #ifdef CONFIG_IDEDMA_AUTO
- int noautodma = 0;
-@@ -2489,9 +2489,9 @@
-  */
- static void __init probe_for_hwifs (void)
- {
- #ifdef CONFIG_BLK_DEV_IDEPCI
- 	if (pci_present())
- 	{
--		ide_scan_pcibus(ide_scan_direction);
-+		ide_scan_pcibus();
- 	}
- #endif /* CONFIG_BLK_DEV_IDEPCI */
---- linux-2.4.27/drivers/ide/setup-pci.c	2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.27+debian/drivers/ide/setup-pci.c	2004-08-11 23:52:58.000000000 +0200
+--- kernel-source-2.4.27-2.4.27/drivers/ide/setup-pci.c~	2004-09-04 14:47:31.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/ide/setup-pci.c	2004-09-04 14:47:53.000000000 -0700
 @@ -793,21 +793,20 @@
  
  /**
@@ -40,13 +18,13 @@
   */
   	
 -void __init ide_scan_pcibus (int scan_direction)
-+void __init ide_scan_pcibus(void)
++void __init ide_scan_pcibus (void)
  {
  	struct pci_dev *dev;
  	struct pci_driver *d;
  	struct list_head *l, *n;
- 	
-        pre_init = 0;
+ 
+ 	pre_init = 0;
 -	if (!scan_direction) {
 +	if (!ide_scan_direction) {
  		pci_for_each_dev(dev) {
@@ -71,3 +49,23 @@
  extern int ide_pci_register_driver(struct pci_driver *driver);
  extern void ide_pci_unregister_driver(struct pci_driver *driver);
  
+--- kernel-source-2.4.27-2.4.27/drivers/ide/ide.c~	2004-09-04 14:46:54.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/ide/ide.c	2004-09-04 14:47:22.000000000 -0700
+@@ -172,7 +172,7 @@
+ static int system_bus_speed;	/* holds what we think is VESA/PCI bus speed */
+ static int initializing;	/* set while initializing built-in drivers */
+ 
+-static int ide_scan_direction;	/* THIS was formerly 2.2.x pci=reverse */
++int ide_scan_direction;	/* THIS was formerly 2.2.x pci=reverse */
+ 
+ #ifdef CONFIG_IDEDMA_AUTO
+ int noautodma = 0;
+@@ -2492,7 +2492,7 @@
+ #ifdef CONFIG_BLK_DEV_IDEPCI
+ 	if (pci_present())
+ 	{
+-		ide_scan_pcibus(ide_scan_direction);
++		ide_scan_pcibus();
+ 	}
+ #endif /* CONFIG_BLK_DEV_IDEPCI */
+ 	ide_scan_drivers();