diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /drivers/ata/libata.h | |
parent | Merge branch 'cleanups' into next (diff) | |
parent | x86_64: make ptrace always sign-extend orig_ax to 64 bits (diff) | |
download | linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz linux-9446389ef612096704fdf18fa79bab423d4110f0.zip |
Merge commit 'origin' into devel
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 6036dedfe377..aa884f71a12a 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -56,7 +56,6 @@ 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; |