Merge branch 'master'

[powerpc.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 70ae140..a7cb46c 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <linux/ata.h>
 #include <linux/workqueue.h>
@@ -399,12 +400,13 @@ struct ata_port_operations {
 };
 
 struct ata_port_info {
-       struct scsi_host_template *sht;
+       struct scsi_host_template       *sht;
        unsigned long           host_flags;
        unsigned long           pio_mask;
        unsigned long           mwdma_mask;
        unsigned long           udma_mask;
        const struct ata_port_operations *port_ops;
+       void                    *private_data;
 };
 
 struct ata_timing {