PCI Hotplug: move drivers/hotplug/* to drivers/pci/hotplug/*

  
This will let include/linux/pci.h get smaller, and is what I should 
have done in the first place 2 years ago...

arch/i386/Kconfig

@@ -1135,7 +1135,7 @@ config HOTPLUG
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 

arch/ia64/Kconfig

@@ -563,7 +563,7 @@ config HOTPLUG
 	  agent" (/sbin/hotplug) to load modules and set up software needed
 	  to use devices as you hotplug them.
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 

arch/m68knommu/Kconfig

@@ -488,7 +488,7 @@ config HOTPLUG
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 

arch/ppc64/Kconfig

@@ -234,7 +234,7 @@ config HOTPLUG
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 config PROC_DEVICETREE
 	bool "Support for Open Firmware device tree in /proc"

arch/v850/Kconfig

@@ -230,7 +230,7 @@ config HOTPLUG
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 

arch/x86_64/Kconfig

@@ -351,7 +351,7 @@ config HOTPLUG
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/hotplug/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 

drivers/Makefile

@@ -46,7 +46,6 @@ obj-$(CONFIG_I2C)		+= i2c/
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
-obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
 obj-$(CONFIG_ISDN_BOOL)		+= isdn/
 obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)		+= eisa/

drivers/pci/Makefile

@@ -12,6 +12,9 @@ ifndef CONFIG_SPARC64
 obj-$(CONFIG_PCI) += setup-res.o
 endif
 
+# Build the PCI Hotplug drivers if we were asked to
+obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
+
 #
 # Some architectures use the generic PCI setup functions
 #

drivers/hotplug/cpqphp_core.c → drivers/pci/hotplug/cpqphp_core.c

@@ -45,7 +45,7 @@
 
 #include "cpqphp.h"
 #include "cpqphp_nvram.h"
-#include "../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependent we are... */
+#include "../../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependent we are... */
 
 
 /* Global variables */

drivers/hotplug/cpqphp_pci.c → drivers/pci/hotplug/cpqphp_pci.c

@@ -36,7 +36,7 @@
 #include <linux/pci.h>
 #include "cpqphp.h"
 #include "cpqphp_nvram.h"
-#include "../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependent we are... */
+#include "../../../arch/i386/pci/pci.h"	/* horrible hack showing how processor dependent we are... */
 
 
 u8 cpqhp_nic_irq;

drivers/hotplug/ibmphp_core.c → drivers/pci/hotplug/ibmphp_core.c

@@ -35,7 +35,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
-#include "../../arch/i386/pci/pci.h"	/* for struct irq_routing_table */
+#include "../../../arch/i386/pci/pci.h"	/* for struct irq_routing_table */
 #include "ibmphp.h"
 
 #define attn_on(sl)  ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)