---

yaml --- r: 108113 b: refs/heads/master c: bba8116 h: refs/heads/master i: 108111: f99cd6c v: v3
git-mirror · Aug 7, 2008 · bd7de85 · bd7de85
1 parent 441e83c
commit bd7de85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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);