diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
| commit | 84cdda8a1966288de26be5cecf7702d378861ff9 (patch) | |
| tree | 914924b2a78ca756a35c3480d7abb2726f2db1f4 /include/linux/ide.h | |
| parent | 3c50c61826d1e2e9354232f625216c8fcfef48db (diff) | |
| parent | 6e6ece5dc6022e8086c565498d23511bbceda811 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 77ae55d4c13c..ac8b25fa6506 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1329,7 +1329,8 @@ void ide_init_disk(struct gendisk *, ide_drive_t *); | |||
| 1329 | extern int ideprobe_init(void); | 1329 | extern int ideprobe_init(void); |
| 1330 | 1330 | ||
| 1331 | extern void ide_scan_pcibus(int scan_direction) __init; | 1331 | extern void ide_scan_pcibus(int scan_direction) __init; |
| 1332 | extern int ide_pci_register_driver(struct pci_driver *driver); | 1332 | extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner); |
| 1333 | #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE) | ||
| 1333 | extern void ide_pci_unregister_driver(struct pci_driver *driver); | 1334 | extern void ide_pci_unregister_driver(struct pci_driver *driver); |
| 1334 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); | 1335 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); |
| 1335 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); | 1336 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); |