Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux-2.5-pci

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

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 \
@@ -150,7 +151,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_DIO) += drivers/dio/dio.a

arch/i386/Makefile

@@ -98,6 +98,11 @@ SUBDIRS += arch/i386/math-emu
 DRIVERS += arch/i386/math-emu/math.o
 endif
 
+ifdef CONFIG_PCI
+SUBDIRS	+= arch/i386/pci
+DRIVERS	+= arch/i386/pci/pci.o
+endif
+
 arch/i386/kernel: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=arch/i386/kernel
 

arch/i386/kernel/Makefile

@@ -10,7 +10,7 @@
 EXTRA_AFLAGS	:= -traditional
 USE_STANDARD_AS_RULE	:= true
 
-all: first_rule kernel.o head.o init_task.o
+all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
@@ -37,8 +37,4 @@ obj-y += setup-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 endif
 
-kernel-subdir-$(CONFIG_PCI)	+= pci
-subdir-y			:= $(kernel-subdir-y)
-obj-y				+= $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
-
 include $(TOPDIR)/Rules.make

arch/i386/kernel/pci/Makefile → 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/kernel/pci/acpi.c → arch/i386/pci/acpi.c

@@ -59,12 +59,16 @@ static int acpi_lookup_irq (
 static int __init pci_acpi_init(void)
 {
 	if (!(pci_probe & PCI_NO_ACPI_ROUTING)) {
-		printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
-		printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi'\n");
-		pci_use_acpi_routing = 1;
-		pci_lookup_irq = acpi_lookup_irq;
+		if (acpi_prts.count) {
+			printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+			printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi'\n");
+			pci_use_acpi_routing = 1;
+			pci_lookup_irq = acpi_lookup_irq;
+		} else
+			printk(KERN_WARNING "PCI: Invalid ACPI-PCI IRQ routing table\n");
+
 	}
 	return 0;
 }
 
-subsys_initcall(pci_acpi_init);
+arch_initcall(pci_acpi_init);

arch/i386/kernel/pci/direct.c → 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/kernel/pci/pcbios.c → 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/hotplug/cpqphp_core.c

@@ -38,7 +38,7 @@
 #include <asm/uaccess.h>
 #include "cpqphp.h"
 #include "cpqphp_nvram.h"
-#include "../../arch/i386/kernel/pci/pci.h"	/* horrible hack showing how processor dependant we are... */
+#include "../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependant we are... */
 
 
 /* Global variables */

drivers/hotplug/cpqphp_pci.c

@@ -35,7 +35,7 @@
 #include <linux/pci.h>
 #include "cpqphp.h"
 #include "cpqphp_nvram.h"
-#include "../../arch/i386/kernel/pci/pci.h"	/* horrible hack showing how processor dependant we are... */
+#include "../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependant we are... */
 
 
 u8 cpqhp_nic_irq;

drivers/hotplug/ibmphp_core.c

@@ -35,7 +35,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
-#include "../../arch/i386/kernel/pci/pci.h"	/* for struct irq_routing_table */
+#include "../../arch/i386/pci/pci.h"	/* for struct irq_routing_table */
 #include "ibmphp.h"
 
 #define attn_on(sl)  ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)