Move arch/i386/kernel/pci/ to arch/i386/pci/

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 @@
 .S.o:
 	$(CC) $(AFLAGS) -traditional -c $< -o $*.o
 
-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