summaryrefslogtreecommitdiff
path: root/arch/x86/pci/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-18 00:20:14 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-02-18 00:20:14 (GMT)
commit8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch)
treee0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /arch/x86/pci/Makefile
parent232486e1e9f34889424b68ee6270440b554479a2 (diff)
parentb0483e78e5c4c9871fc5541875b3bc006846d46b (diff)
downloadlinux-fsl-qoriq-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.xz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/pci/Makefile')
-rw-r--r--arch/x86/pci/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 564b008..39fba37 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-y += common.o early.o
obj-y += amd_bus.o
-obj-$(CONFIG_X86_64) += bus_numa.o intel_bus.o
+obj-$(CONFIG_X86_64) += bus_numa.o
ifeq ($(CONFIG_PCI_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG