[Acpi-checkins] CVS: linux acpi-other-files.diff,1.6,1.7

[Andy G. <ag...@us...>]

Update of /cvsroot/acpi/linux
In directory usw-pr-cvs1:/tmp/cvs-serv21442

Modified Files:
	acpi-other-files.diff 
Log Message:
update to 20020419

Index: acpi-other-files.diff
===================================================================
RCS file: /cvsroot/acpi/linux/acpi-other-files.diff,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** acpi-other-files.diff	5 Apr 2002 18:38:10 -0000	1.6
--- acpi-other-files.diff	19 Apr 2002 23:19:55 -0000	1.7
***************
*** 1,772 ****
  diff -Naur -X bin/dontdiff linux-old/include/linux/acpi.h linux/include/linux/acpi.h
! --- linux-old/include/linux/acpi.h	Mon Mar 18 12:37:02 2002
! +++ linux/include/linux/acpi.h	Thu Apr  4 15:40:03 2002
! @@ -29,6 +29,12 @@
!  #define _LINUX
!  #endif
!  
! +/*
! + * YES this is ugly.
! + * But, moving all of ACPI's private headers to include/acpi isn't the right
[...1458 lines suppressed...]
!  		}
   	}
   
! -	printk("PCI: Probing PCI hardware (bus %02x)\n", busnum);
! +	printk("PCI: Probing hardware on bus (%02x:%02x)\n", seg, bus);
!  
! -	return pci_scan_bus(busnum, pci_root_ops, NULL);
! +	return pci_scan_bus(bus, pci_root_ops, NULL);
!  }
!  
!  void __devinit pcibios_config_init(void)
! @@ -1304,7 +1305,7 @@
!  	}
!  
!  	printk("PCI: Probing PCI hardware\n");
! -	pci_root_bus = pcibios_scan_root(0);
! +	pci_root_bus = pcibios_scan_root(0, 0);
!  	if (clustered_apic_mode && (numnodes > 1)) {
!  		for (quad = 1; quad < numnodes; ++quad) {
!  			printk("Scanning PCI bus %d for quad %d\n",