diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 831b9cc2f1d9..7212fe417726 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -361,7 +361,6 @@ typedef union { | |||
361 | * ATA DATA Register Special. | 361 | * ATA DATA Register Special. |
362 | * ATA NSECTOR Count Register(). | 362 | * ATA NSECTOR Count Register(). |
363 | * ATAPI Byte Count Register. | 363 | * ATAPI Byte Count Register. |
364 | * Channel index ordering pairs. | ||
365 | */ | 364 | */ |
366 | typedef union { | 365 | typedef union { |
367 | unsigned all :16; | 366 | unsigned all :16; |
@@ -376,7 +375,7 @@ typedef union { | |||
376 | #error "Please fix <asm/byteorder.h>" | 375 | #error "Please fix <asm/byteorder.h>" |
377 | #endif | 376 | #endif |
378 | } b; | 377 | } b; |
379 | } ata_nsector_t, ata_data_t, atapi_bcount_t, ata_index_t; | 378 | } ata_nsector_t, ata_data_t, atapi_bcount_t; |
380 | 379 | ||
381 | /* | 380 | /* |
382 | * ATA-IDE Select Register, aka Device-Head | 381 | * ATA-IDE Select Register, aka Device-Head |
@@ -1200,7 +1199,7 @@ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *o | |||
1200 | #define ide_pci_register_driver(d) pci_register_driver(d) | 1199 | #define ide_pci_register_driver(d) pci_register_driver(d) |
1201 | #endif | 1200 | #endif |
1202 | 1201 | ||
1203 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); | 1202 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, u8 *); |
1204 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); | 1203 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); |
1205 | 1204 | ||
1206 | extern void default_hwif_iops(ide_hwif_t *); | 1205 | extern void default_hwif_iops(ide_hwif_t *); |
@@ -1378,7 +1377,7 @@ void ide_unregister_region(struct gendisk *); | |||
1378 | 1377 | ||
1379 | void ide_undecoded_slave(ide_hwif_t *); | 1378 | void ide_undecoded_slave(ide_hwif_t *); |
1380 | 1379 | ||
1381 | extern int probe_hwif_init(ide_hwif_t *); | 1380 | int ide_device_add(u8 idx[4]); |
1382 | 1381 | ||
1383 | static inline void *ide_get_hwifdata (ide_hwif_t * hwif) | 1382 | static inline void *ide_get_hwifdata (ide_hwif_t * hwif) |
1384 | { | 1383 | { |