pciehp: cleanup pciehp.h

This patch cleans up pciehp.h. This has no functional change.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/pci/hotplug/pciehp.h
Simple merge

diff --cc drivers/pci/hotplug/pciehp_core.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp_ctrl.c
Simple merge