Merge bk://ldm@bkbits.net/linux-2.5-pci

into segfault.osdl.org:/home/mochel/src/kernel/devel/linux-2.5-pci

Makefile

@@ -130,6 +130,7 @@ DRIVERS-m :=
 DRIVERS-  :=
 
 DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
+DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
 DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
 DRIVERS-y += drivers/base/base.o \
 	drivers/char/char.o \
@@ -157,7 +158,6 @@ DRIVERS-y += drivers/cdrom/driver.o
 endif
 
 DRIVERS-$(CONFIG_SOUND) += sound/sound.o
-DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
 DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
 DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
 DRIVERS-$(CONFIG_NET_PCMCIA) += drivers/net/pcmcia/pcmcia_net.o

arch/i386/pci/Makefile

@@ -16,9 +16,9 @@ obj-y		+= fixup.o
 
 ifdef	CONFIG_ACPI_PCI
 obj-y		+= acpi.o
-else
-obj-y		+= legacy.o
 endif
+obj-y		+= legacy.o
+
 
 endif		# CONFIG_MULTIQUAD
 obj-y		+= irq.o common.o

arch/i386/pci/acpi.c

@@ -67,4 +67,4 @@ static int __init pci_acpi_init(void)
 	return 0;
 }
 
-subsys_initcall(pci_acpi_init);
+arch_initcall(pci_acpi_init);

arch/i386/pci/direct.c

@@ -363,4 +363,4 @@ static int __init pci_direct_init(void)
 	return 0;
 }
 
-subsys_initcall(pci_direct_init);
+arch_initcall(pci_direct_init);

arch/i386/pci/pcbios.c

@@ -556,4 +556,4 @@ static int __init pci_pcbios_init(void)
 	return 0;
 }
 
-subsys_initcall(pci_pcbios_init);
+arch_initcall(pci_pcbios_init);

drivers/pci/pci.c

@@ -580,7 +580,7 @@ static int __devinit pci_setup(char *str)
 	return 1;
 }
 
-subsys_initcall(pci_init);
+device_initcall(pci_init);
 
 __setup("pci=", pci_setup);