summaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 14:04:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 14:04:37 -0800
commitd72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch)
treed3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /include/linux/libata.h
parent33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff)
parent8a87a0b6313109d2fea87b1271d497c954ce2ca8 (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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 1464a7586de..ad5996183ec 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -399,7 +399,7 @@ 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;