Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-drm-fsl-dcu.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1507f8cc45fdb5ee1529ed9bc91cb54aa2c19e59..805412cc68751daadc82d5f8ced4482b7b1f586f 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -583,10 +583,11 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
 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 *);
+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);
+       return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
 }
 
 void pci_unregister_driver(struct pci_driver *);