Commit fb9aa6f1 authored by Thomas Gleixner's avatar Thomas Gleixner

i386: move pci

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4b60eb83
...@@ -107,7 +107,7 @@ core-y += arch/i386/kernel/ \ ...@@ -107,7 +107,7 @@ core-y += arch/i386/kernel/ \
$(mcore-y)/ \ $(mcore-y)/ \
arch/x86/crypto/ arch/x86/crypto/
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/ drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
drivers-$(CONFIG_PCI) += arch/i386/pci/ drivers-$(CONFIG_PCI) += arch/x86/pci/
# must be linked after kernel/ # must be linked after kernel/
drivers-$(CONFIG_OPROFILE) += arch/i386/oprofile/ drivers-$(CONFIG_OPROFILE) += arch/i386/oprofile/
drivers-$(CONFIG_PM) += arch/x86/power/ drivers-$(CONFIG_PM) += arch/x86/power/
......
ifeq ($(CONFIG_X86_32),y) ifeq ($(CONFIG_X86_32),y)
include ${srctree}/arch/i386/pci/Makefile_32 include ${srctree}/arch/x86/pci/Makefile_32
else else
include ${srctree}/arch/x86_64/pci/Makefile_64 include ${srctree}/arch/x86_64/pci/Makefile_64
endif endif
ifeq ($(CONFIG_X86_32),y) ifeq ($(CONFIG_X86_32),y)
include ${srctree}/arch/i386/pci/Makefile_32 include ${srctree}/arch/x86/pci/Makefile_32
else else
include ${srctree}/arch/x86_64/pci/Makefile_64 include ${srctree}/arch/x86_64/pci/Makefile_64
endif endif
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Reuse the i386 PCI subsystem # Reuse the i386 PCI subsystem
# #
EXTRA_CFLAGS += -Iarch/i386/pci EXTRA_CFLAGS += -Iarch/x86/pci
obj-y := i386.o obj-y := i386.o
obj-$(CONFIG_PCI_DIRECT)+= direct.o obj-$(CONFIG_PCI_DIRECT)+= direct.o
...@@ -15,13 +15,13 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o ...@@ -15,13 +15,13 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
obj-$(CONFIG_NUMA) += k8-bus_64.o obj-$(CONFIG_NUMA) += k8-bus_64.o
direct-y += ../../i386/pci/direct.o direct-y += ../../x86/pci/direct.o
acpi-y += ../../i386/pci/acpi.o acpi-y += ../../x86/pci/acpi.o
legacy-y += ../../i386/pci/legacy.o legacy-y += ../../x86/pci/legacy.o
irq-y += ../../i386/pci/irq.o irq-y += ../../x86/pci/irq.o
common-y += ../../i386/pci/common.o common-y += ../../x86/pci/common.o
fixup-y += ../../i386/pci/fixup.o fixup-y += ../../x86/pci/fixup.o
i386-y += ../../i386/pci/i386.o i386-y += ../../x86/pci/i386.o
init-y += ../../i386/pci/init.o init-y += ../../x86/pci/init.o
early-y += ../../i386/pci/early.o early-y += ../../x86/pci/early.o
mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o mmconfig-shared-y += ../../x86/pci/mmconfig-shared.o
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "cpqphp.h" #include "cpqphp.h"
#include "cpqphp_nvram.h" #include "cpqphp_nvram.h"
#include "../../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */ #include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */
/* Global variables */ /* Global variables */
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "../pci.h" #include "../pci.h"
#include "cpqphp.h" #include "cpqphp.h"
#include "cpqphp_nvram.h" #include "cpqphp_nvram.h"
#include "../../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */ #include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */
u8 cpqhp_nic_irq; u8 cpqhp_nic_irq;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/wait.h> #include <linux/wait.h>
#include "../pci.h" #include "../pci.h"
#include "../../../arch/i386/pci/pci.h" /* for struct irq_routing_table */ #include "../../../arch/x86/pci/pci.h" /* for struct irq_routing_table */
#include "ibmphp.h" #include "ibmphp.h"
#define attn_on(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON) #define attn_on(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment