diff -urpN -X /home/fletch/.diff.exclude 872-swsusp_state_check/drivers/pci/Makefile 873-pci_hotplug/drivers/pci/Makefile
--- 872-swsusp_state_check/drivers/pci/Makefile	Sat Jun 14 18:37:31 2003
+++ 873-pci_hotplug/drivers/pci/Makefile	Tue Jun 24 21:35:10 2003
@@ -3,14 +3,15 @@
 #
 
 obj-y		+= access.o bus.o probe.o pci.o pool.o quirks.o \
-			names.o pci-driver.o search.o hotplug.o \
-			pci-sysfs.o
+			names.o pci-driver.o search.o pci-sysfs.o
 obj-$(CONFIG_PM)  += power.o
 obj-$(CONFIG_PROC_FS) += proc.o
 
 ifndef CONFIG_SPARC64
 obj-$(CONFIG_PCI) += setup-res.o
 endif
+
+obj-$(CONFIG_HOTPLUG) += hotplug.o
 
 # Build the PCI Hotplug drivers if we were asked to
 obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
diff -urpN -X /home/fletch/.diff.exclude 872-swsusp_state_check/drivers/pci/hotplug.c 873-pci_hotplug/drivers/pci/hotplug.c
--- 872-swsusp_state_check/drivers/pci/hotplug.c	Tue Jun 24 21:29:20 2003
+++ 873-pci_hotplug/drivers/pci/hotplug.c	Tue Jun 24 21:35:10 2003
@@ -12,7 +12,6 @@
 
 static void pci_free_resources(struct pci_dev *dev);
 
-#ifdef CONFIG_HOTPLUG
 int pci_hotplug (struct device *dev, char **envp, int num_envp,
 		 char *buffer, int buffer_size)
 {
@@ -209,16 +208,6 @@ int pci_remove_device_safe(struct pci_de
 }
 EXPORT_SYMBOL(pci_remove_device_safe);
 
-#else /* CONFIG_HOTPLUG */
-
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
-		 char *buffer, int buffer_size)
-{
-	return -ENODEV;
-}
-
-#endif /* CONFIG_HOTPLUG */
-
 static void
 pci_free_resources(struct pci_dev *dev)
 {
@@ -283,7 +272,5 @@ void pci_remove_behind_bridge(struct pci
 	}
 }
 
-#ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(pci_remove_bus_device);
 EXPORT_SYMBOL(pci_remove_behind_bridge);
-#endif
diff -urpN -X /home/fletch/.diff.exclude 872-swsusp_state_check/drivers/pci/pci-driver.c 873-pci_hotplug/drivers/pci/pci-driver.c
--- 872-swsusp_state_check/drivers/pci/pci-driver.c	Tue Jun 24 21:29:20 2003
+++ 873-pci_hotplug/drivers/pci/pci-driver.c	Tue Jun 24 21:35:10 2003
@@ -486,6 +486,14 @@ void pci_dev_put(struct pci_dev *dev)
 		put_device(&dev->dev);
 }
 
+#ifndef CONFIG_HOTPLUG
+int pci_hotplug (struct device *dev, char **envp, int num_envp,
+		 char *buffer, int buffer_size)
+{
+	return -ENODEV;
+}
+#endif
+
 struct bus_type pci_bus_type = {
 	.name		= "pci",
 	.match		= pci_bus_match,