aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-18 13:08:39 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-18 13:08:39 -0700
commit43fde784a698aff26de0fc1dbd84aa075b8cfb5f (patch)
tree948ad7acecc67e1e13acc7895a3028cdfb2a6560 /include
parentc2a0f5943d8935766a42b2d0870aa4c645e3423d (diff)
parentf9d1fe9630b94007902987c39d19f04dc6256eac (diff)
downloadkernel_samsung_smdk4412-43fde784a698aff26de0fc1dbd84aa075b8cfb5f.zip
kernel_samsung_smdk4412-43fde784a698aff26de0fc1dbd84aa075b8cfb5f.tar.gz
kernel_samsung_smdk4412-43fde784a698aff26de0fc1dbd84aa075b8cfb5f.tar.bz2
Merge 'upstream-2.6.13' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include')
-rw-r--r--include/linux/ata.h1
-rw-r--r--include/linux/libata.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index f178894..ca5fcad 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -224,6 +224,7 @@ struct ata_taskfile {
};
#define ata_id_is_ata(id) (((id)[0] & (1 << 15)) == 0)
+#define ata_id_is_sata(id) ((id)[93] == 0)
#define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
#define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
#define ata_id_has_flush(id) ((id)[83] & (1 << 12))
diff --git a/include/linux/libata.h b/include/linux/libata.h
index b009f80..6cd9ba6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -421,6 +421,7 @@ extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
extern unsigned int ata_dev_classify(struct ata_taskfile *tf);
extern void ata_dev_id_string(u16 *id, unsigned char *s,
unsigned int ofs, unsigned int len);
+extern void ata_dev_config(struct ata_port *ap, unsigned int i);
extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
extern void ata_bmdma_start (struct ata_queued_cmd *qc);
extern void ata_bmdma_stop(struct ata_port *ap);