diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:25:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:25:54 -0800 |
| commit | d5eebf428ac91ad12d316a391b734670d61480d8 (patch) | |
| tree | 2cf868d1e29714250697f03f5da1ac3a5934178c /include | |
| parent | 5643f000c1e10ab991182478b76550e1364c3570 (diff) | |
| parent | e99f8b5efe78110e4af10f35ebf11feeef8f43b6 (diff) | |
| download | op-kernel-dev-d5eebf428ac91ad12d316a391b734670d61480d8.zip op-kernel-dev-d5eebf428ac91ad12d316a391b734670d61480d8.tar.gz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 6f07522..1464a75 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 { |
