From 4dde8bdcd6fb41b23c579c57d1b9ef2c7fb4fbbc Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 15 Apr 2013 10:44:18 -0600 Subject: [PATCH] --- yaml --- r: 362889 b: refs/heads/master c: c3139ba212ddc240656f4bcfc7c946418cd83e19 h: refs/heads/master i: 362887: c3163004c5cee68acc4a87936da01b82d447f0fd v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/cpci_hotplug.h | 8 ++++++++ trunk/drivers/pci/hotplug/pci_hotplug_core.c | 9 +-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8248d086e8ad..26ab71052d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9738abedd6721926dfb25fe6912be207b7168d03 +refs/heads/master: c3139ba212ddc240656f4bcfc7c946418cd83e19 diff --git a/trunk/drivers/pci/hotplug/cpci_hotplug.h b/trunk/drivers/pci/hotplug/cpci_hotplug.h index 9fff878cf026..3ae19f774cb3 100644 --- a/trunk/drivers/pci/hotplug/cpci_hotplug.h +++ b/trunk/drivers/pci/hotplug/cpci_hotplug.h @@ -99,4 +99,12 @@ extern int cpci_led_off(struct slot * slot); extern int cpci_configure_slot(struct slot *slot); extern int cpci_unconfigure_slot(struct slot *slot); +#ifdef CONFIG_HOTPLUG_PCI_CPCI +int cpci_hotplug_init(int debug); +void cpci_hotplug_exit(void); +#else +static inline int cpci_hotplug_init(int debug) { return 0; } +static inline void cpci_hotplug_exit(void) { } +#endif + #endif /* _CPCI_HOTPLUG_H */ diff --git a/trunk/drivers/pci/hotplug/pci_hotplug_core.c b/trunk/drivers/pci/hotplug/pci_hotplug_core.c index 202f4a969eb5..6a25f4d8ba32 100644 --- a/trunk/drivers/pci/hotplug/pci_hotplug_core.c +++ b/trunk/drivers/pci/hotplug/pci_hotplug_core.c @@ -41,6 +41,7 @@ #include #include #include "../pci.h" +#include "cpci_hotplug.h" #define MY_NAME "pci_hotplug" @@ -63,14 +64,6 @@ static bool debug; static LIST_HEAD(pci_hotplug_slot_list); static DEFINE_MUTEX(pci_hp_mutex); -#ifdef CONFIG_HOTPLUG_PCI_CPCI -extern int cpci_hotplug_init(int debug); -extern void cpci_hotplug_exit(void); -#else -static inline int cpci_hotplug_init(int debug) { return 0; } -static inline void cpci_hotplug_exit(void) { } -#endif - /* Weee, fun with macros... */ #define GET_STATUS(name,type) \ static int get_##name (struct hotplug_slot *slot, type *value) \