From 35ff1c4e88d07dda7aecd2321ac00e476c962d41 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Mon, 20 Jun 2005 14:29:25 -0700
Subject: [PATCH] --- yaml --- r: 4097 b: refs/heads/master c:
 43a6b76050aa137c51d00eec91d67ac43ac3846e h: refs/heads/master i:   4095:
 39ad1eed1795cfe398d90d135adf04b6fc26ea86 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/Makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 203257e5bdc1..0599dc199943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5848f23d811acc1cb6c19a12e1341e0640a85d0e
+refs/heads/master: 43a6b76050aa137c51d00eec91d67ac43ac3846e
diff --git a/trunk/drivers/pci/Makefile b/trunk/drivers/pci/Makefile
index 7dea494c0d7b..3657f6199c48 100644
--- a/trunk/drivers/pci/Makefile
+++ b/trunk/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