PCI Update: Fix oops on boot w/ ACPI enabled

diff --git a/Makefile b/Makefile
index a92e0bfec2bc32b5315d5b813f36b8bc5aeb704e..a5cc0f55672424acb38d396dce03233d4a40ca35 100644 (file)
--- a/Makefile
+++ b/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

diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index e07ba5498e0124d4fa15833238bf24cf960ee9e5..0a905368a11ebca93a3da8c7dee31358da8c391e 100644 (file)
--- a/arch/i386/pci/Makefile
+++ b/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

diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index dd2c45d9d48ef9c488e9fe7bd912ca07ff698ae8..efae58e0f04b1a489ebe7659c6f4c3c1509f1ec5 100644 (file)
--- a/arch/i386/pci/acpi.c
+++ b/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);

diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 594a55665f49a0ee7500f814c66e7360d3a9d5d8..887326ccaaf8f2fb039f345000ea67437053c247 100644 (file)
--- a/arch/i386/pci/direct.c
+++ b/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);

diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index c1ef99674aab60b869014d897cb93cdec354407d..4d3cec0fa304fc7ca6b96c2db88c3552961dd0dc 100644 (file)
--- a/arch/i386/pci/pcbios.c
+++ b/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);

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 27e532c1ac1e3a98f5c46e89dfec82a1ecce6867..6a3c4d8180d369204564463ea8d68b6c6cd70bdb 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -578,7 +578,7 @@ static int __devinit pci_setup(char *str)
        return 1;
 }
 
-subsys_initcall(pci_init);
+device_initcall(pci_init);
 
 __setup("pci=", pci_setup);