summaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug/ibmphp.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2005-01-09 16:52:36 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2005-01-09 16:52:36 -0800
commite57e50f6a5f4d10c8485bd2affe6c3385dabe2fe (patch)
treea24cc4d0ed37044b8237e6b162108ff69bd12d32 /drivers/pci/hotplug/ibmphp.h
parent11d7829025bddd70d592061728e62e0419de0349 (diff)
parent9fa0bfe4100de3d4edb293f9a464ae711ff8c9e2 (diff)
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'drivers/pci/hotplug/ibmphp.h')
-rw-r--r--drivers/pci/hotplug/ibmphp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
index b42346b023f2..5bc039da647f 100644
--- 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