diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 23:02:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 23:02:36 -0400 |
| commit | d3a36fb82a0864a85e238ac946817030a18c5f9a (patch) | |
| tree | daa6efef3d8ce80515a85c7500a858bd8ec0be2c /drivers/ata/libata.h | |
| parent | e94bd23f67c87011f012f26ca0af3fcf6878eeac (diff) | |
| parent | 8fd7d1b16ea0e1b3b0823ed91b58993d6c6a1cc6 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_via: pcim_iomap_regions() conversion missed BAR5
libata: remove libata.spindown_compat
sata_nv: fix fallout of devres conversion
drivers/ata: remove the wildcard from sata_nv driver
Diffstat (limited to 'drivers/ata/libata.h')
| -rw-r--r-- | drivers/ata/libata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 13cb0c9af68d..5e2466658420 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
| @@ -58,7 +58,6 @@ extern int atapi_enabled; | |||
| 58 | extern int atapi_dmadir; | 58 | extern int atapi_dmadir; |
| 59 | extern int libata_fua; | 59 | extern int libata_fua; |
| 60 | extern int libata_noacpi; | 60 | extern int libata_noacpi; |
| 61 | extern int ata_spindown_compat; | ||
| 62 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev); | 61 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev); |
| 63 | extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, | 62 | extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, |
| 64 | u64 block, u32 n_block, unsigned int tf_flags, | 63 | u64 block, u32 n_block, unsigned int tf_flags, |