diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /include/linux/libata.h | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 1464a7586de8..ad5996183ec2 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -399,7 +399,7 @@ struct ata_port_operations { | |||
| 399 | }; | 399 | }; |
| 400 | 400 | ||
| 401 | struct ata_port_info { | 401 | struct ata_port_info { |
| 402 | struct scsi_host_template *sht; | 402 | struct scsi_host_template *sht; |
| 403 | unsigned long host_flags; | 403 | unsigned long host_flags; |
| 404 | unsigned long pio_mask; | 404 | unsigned long pio_mask; |
| 405 | unsigned long mwdma_mask; | 405 | unsigned long mwdma_mask; |