summaryrefslogtreecommitdiff
path: root/drivers/ata/libata.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 19:41:29 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 19:41:29 (GMT)
commit3a4b7886ee59e122d359e1714ed89585a06645ad (patch)
treed4db00a37e7d3013f2c5f7cad9f6d83c8c0f4c29 /drivers/ata/libata.h
parentb8a327be3fbf05b5d3a935b4c03a3dcdb6db833e (diff)
parent963e4975c6f93c148ca809d986d412201df9af89 (diff)
downloadlinux-fsl-qoriq-3a4b7886ee59e122d359e1714ed89585a06645ad.tar.xz
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_it821x: Driver updates and reworking libata.h: replace __FUNCTION__ with __func__ ata_piix: subsys 106b:00a3 is apple ich8m too libata-core: make sure that ata_force_tbl is freed in case of an error libata: update atapi disable handling pata_via: add VX800 flag; add function for fixing h/w bugs pata_ali: misplaced pci_dev_put()
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r--drivers/ata/libata.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index f6f9c28..ade5c75 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -66,7 +66,6 @@ enum {
extern unsigned int ata_print_id;
extern struct workqueue_struct *ata_aux_wq;
-extern int atapi_enabled;
extern int atapi_passthru16;
extern int libata_fua;
extern int libata_noacpi;