diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
tree | 975f56627b78f757608b31684311a24ca1478481 /include/linux/libata.h | |
parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 70ae140dbf23..a7cb46ca45e7 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
32 | #include <linux/dma-mapping.h> | ||
32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
33 | #include <linux/ata.h> | 34 | #include <linux/ata.h> |
34 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
@@ -399,12 +400,13 @@ struct ata_port_operations { | |||
399 | }; | 400 | }; |
400 | 401 | ||
401 | struct ata_port_info { | 402 | struct ata_port_info { |
402 | struct scsi_host_template *sht; | 403 | struct scsi_host_template *sht; |
403 | unsigned long host_flags; | 404 | unsigned long host_flags; |
404 | unsigned long pio_mask; | 405 | unsigned long pio_mask; |
405 | unsigned long mwdma_mask; | 406 | unsigned long mwdma_mask; |
406 | unsigned long udma_mask; | 407 | unsigned long udma_mask; |
407 | const struct ata_port_operations *port_ops; | 408 | const struct ata_port_operations *port_ops; |
409 | void *private_data; | ||
408 | }; | 410 | }; |
409 | 411 | ||
410 | struct ata_timing { | 412 | struct ata_timing { |