1 files changed, 5 insertions, 9 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8a7cc13c8516..95b74ba7dbf4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -253,10 +253,6 @@ enum {
         ATA_DMA_PAD_SZ          = 4,
         ATA_DMA_PAD_BUF_SZ      = ATA_DMA_PAD_SZ * ATA_MAX_QUEUE,
 
-        /* masks for port functions */
-        ATA_PORT_PRIMARY        = (1 << 0),
-        ATA_PORT_SECONDARY      = (1 << 1),
-
         /* ering size */
         ATA_ERING_SIZE          = 32,
 
@@ -688,8 +684,8 @@ extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes);
 extern void ata_port_disable(struct ata_port *);
 extern void ata_std_ports(struct ata_ioports *ioaddr);
 #ifdef CONFIG_PCI
-extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
-                             unsigned int n_ports);
+extern int ata_pci_init_one (struct pci_dev *pdev,
+                             const struct ata_port_info * const * ppi);
 extern void ata_pci_remove_one (struct pci_dev *pdev);
 #ifdef CONFIG_PM
 extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
@@ -854,11 +850,11 @@ struct pci_bits {
         unsigned long           val;
 };
 
-extern int ata_pci_init_native_host(struct ata_host *host,
-                                    unsigned int port_mask);
+extern int ata_pci_init_native_host(struct ata_host *host);
+extern int ata_pci_init_bmdma(struct ata_host *host);
 extern int ata_pci_prepare_native_host(struct pci_dev *pdev,
                                 const struct ata_port_info * const * ppi,
-                                int n_ports, struct ata_host **r_host);
+                                struct ata_host **r_host);
 extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
 extern unsigned long ata_pci_default_filter(struct ata_device *, unsigned long);
 #endif /* CONFIG_PCI */