Merge with /home/shaggy/git/linus-clean/

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 6f0752219f64..1464a7586de8 100644
--- 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>
@@ -404,6 +405,7 @@ struct ata_port_info {
         unsigned long           mwdma_mask;
         unsigned long           udma_mask;
         const struct ata_port_operations *port_ops;
+        void                    *private_data;
 };
 
 struct ata_timing {