summaryrefslogtreecommitdiff
path: root/drivers/pci/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 22:35:58 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 22:35:58 +0400
commit346fced899c7390e555cf90cd07d1e56b460d21b (patch)
tree4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /drivers/pci/Makefile
parent17af691cd19765b782d891fc50c1568d0f1276b3 (diff)
parent43a6b76050aa137c51d00eec91d67ac43ac3846e (diff)
downloadlinux-346fced899c7390e555cf90cd07d1e56b460d21b.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/Makefile')
-rw-r--r--drivers/pci/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 7dea494c0d7b..3657f6199c48 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
#
# Some architectures use the generic PCI setup functions
#
+obj-$(CONFIG_X86) += setup-bus.o
obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
obj-$(CONFIG_PARISC) += setup-bus.o