vserver 1.9.5.x5

[linux-2.6.git] / drivers / pci / hotplug / ibmphp.h

diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
index b24b8cd..5bc039d 100644 (file)
--- a/drivers/pci/hotplug/ibmphp.h
+++ b/drivers/pci/hotplug/ibmphp.h
@@ -34,7 +34,7 @@
 
 extern int ibmphp_debug;
 
-#if !defined(CONFIG_HOTPLUG_PCI_IBM_MODULE)
+#if !defined(MODULE)
        #define MY_NAME "ibmphpd"
 #else
        #define MY_NAME THIS_MODULE->name
@@ -759,11 +759,5 @@ extern int ibmphp_configure_card (struct pci_func *, u8);
 extern int ibmphp_unconfigure_card (struct slot **, int);
 extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops;
 
-static inline void long_delay (int delay)
-{
-       set_current_state (TASK_INTERRUPTIBLE);
-       schedule_timeout (delay);
-}
-
 #endif                         //__IBMPHP_H