diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/ata/libata.h | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
| download | kernel-crypto-9ef64cb4320df821638b508f79aa8b858cca99f0.tar.gz kernel-crypto-9ef64cb4320df821638b508f79aa8b858cca99f0.tar.xz kernel-crypto-9ef64cb4320df821638b508f79aa8b858cca99f0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/libata.h')
| -rw-r--r-- | drivers/ata/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 409ffb9af16..aa884f71a12 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -56,11 +56,11 @@ enum { extern unsigned int ata_print_id; extern struct workqueue_struct *ata_aux_wq; extern int atapi_enabled; -extern int atapi_dmadir; extern int atapi_passthru16; extern int libata_fua; extern int libata_noacpi; extern int libata_allow_tpm; +extern void ata_force_cbl(struct ata_port *ap); extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev); extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, u64 block, u32 n_block, unsigned int tf_flags, |