diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 4 | ||||
-rw-r--r-- | include/linux/pci.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index e26a03981a..827688f41d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1192,8 +1192,8 @@ void ide_init_disk(struct gendisk *, ide_drive_t *); | |||
1192 | extern int ideprobe_init(void); | 1192 | extern int ideprobe_init(void); |
1193 | 1193 | ||
1194 | extern void ide_scan_pcibus(int scan_direction) __init; | 1194 | extern void ide_scan_pcibus(int scan_direction) __init; |
1195 | extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner); | 1195 | extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name); |
1196 | #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE) | 1196 | #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME) |
1197 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); | 1197 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); |
1198 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); | 1198 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); |
1199 | 1199 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index f3c617eabd..cb899eb95d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -573,10 +573,11 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus, | |||
573 | void pci_enable_bridges(struct pci_bus *bus); | 573 | void pci_enable_bridges(struct pci_bus *bus); |
574 | 574 | ||
575 | /* Proper probing supporting hot-pluggable devices */ | 575 | /* Proper probing supporting hot-pluggable devices */ |
576 | int __must_check __pci_register_driver(struct pci_driver *, struct module *); | 576 | int __must_check __pci_register_driver(struct pci_driver *, struct module *, |
577 | const char *mod_name); | ||
577 | static inline int __must_check pci_register_driver(struct pci_driver *driver) | 578 | static inline int __must_check pci_register_driver(struct pci_driver *driver) |
578 | { | 579 | { |
579 | return __pci_register_driver(driver, THIS_MODULE); | 580 | return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME); |
580 | } | 581 | } |
581 | 582 | ||
582 | void pci_unregister_driver(struct pci_driver *); | 583 | void pci_unregister_driver(struct pci_driver *); |