From bd7de85572af0e1ef9b911e87734f96c6b5625db Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 30 Jul 2008 12:07:04 -0700
Subject: [PATCH] --- yaml --- r: 108113 b: refs/heads/master c:
 bba81165867313766534dd31603de51bdd36ef9b h: refs/heads/master i:   108111:
 f99cd6c97bd84ec088b1f7dd8a59b115f60c997f v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/pci.h | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e368fd96c38d..4fe51ed784d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d82d8eaec032bf935144e0d5789a5cd4b95e958
+refs/heads/master: bba81165867313766534dd31603de51bdd36ef9b
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 825be3878f68..b0269492c34e 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -680,10 +680,12 @@ void pci_enable_bridges(struct pci_bus *bus);
 /* Proper probing supporting hot-pluggable devices */
 int __must_check __pci_register_driver(struct pci_driver *, struct module *,
 				       const char *mod_name);
-static inline int __must_check pci_register_driver(struct pci_driver *driver)
-{
-	return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
-}
+
+/*
+ * pci_register_driver must be a macro so that KBUILD_MODNAME can be expanded
+ */
+#define pci_register_driver(driver)		\
+	__pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
 
 void pci_unregister_driver(struct pci_driver *dev);
 void pci_remove_behind_bridge(struct pci_dev *dev);