Commit 49249950 authored by Patrick Mochel's avatar Patrick Mochel Committed by Linus Torvalds

Move arch/i386/kernel/pci-*.c to arch/i386/kernel/pci/; prepare for further cleanups

parent 0c686811
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.S.o: .S.o:
$(CC) $(AFLAGS) -traditional -c $< -o $*.o $(CC) $(AFLAGS) -traditional -c $< -o $*.o
all: kernel.o head.o init_task.o all: first_rule kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
...@@ -18,19 +18,9 @@ export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o ...@@ -18,19 +18,9 @@ export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \ i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \
bootflag.o bootflag.o
ifdef CONFIG_PCI
obj-y += pci-i386.o
ifdef CONFIG_VISWS
obj-y += pci-visws.o
else
obj-y += pci-pc.o pci-irq.o
endif
endif
obj-$(CONFIG_MCA) += mca.o obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_MTRR) += mtrr.o obj-$(CONFIG_MTRR) += mtrr.o
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
...@@ -47,4 +37,8 @@ obj-y += setup-visws.o ...@@ -47,4 +37,8 @@ obj-y += setup-visws.o
obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o
endif endif
kernel-subdir-$(CONFIG_PCI) += pci
subdir-y := $(kernel-subdir-y)
obj-y += $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
O_TARGET := pci.o
obj-y := dma.o i386.o
ifdef CONFIG_VISWS
obj-y += visws.o
else
obj-y += irq.o
obj-y += common.o
endif
export-objs += $(obj-y)
include $(TOPDIR)/Rules.make
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
#include "pci-i386.h" #include "pci.h"
unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2; unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/errno.h> #include <linux/errno.h>
#include "pci-i386.h" #include "pci.h"
void void
pcibios_update_resource(struct pci_dev *dev, struct resource *root, pcibios_update_resource(struct pci_dev *dev, struct resource *root,
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include "pci-i386.h" #include "pci.h"
#define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24)) #define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))
#define PIRQ_VERSION 0x0100 #define PIRQ_VERSION 0x0100
......
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