diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
| commit | eac0556750e727ff39144a9a9e59d5ccf1fc0e2a (patch) | |
| tree | f5ccff7795b2ad5e47f17fb475599c526f533e79 /drivers/ata/libata.h | |
| parent | f71fa31f9f7ac33cba12b8897983f950ad2c7a5b (diff) | |
| parent | 19853301ef3289bda2d5264c1093e74efddaeab9 (diff) | |
Merge branch 'linus' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
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 2e26fcaf635b..9d0fd0b71852 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
| @@ -53,7 +53,7 @@ enum { | |||
| 53 | ATA_DNXFER_QUIET = (1 << 31), | 53 | ATA_DNXFER_QUIET = (1 << 31), |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | extern unsigned int ata_print_id; | 56 | extern atomic_t ata_print_id; |
| 57 | extern int atapi_passthru16; | 57 | extern int atapi_passthru16; |
| 58 | extern int libata_fua; | 58 | extern int libata_fua; |
| 59 | extern int libata_noacpi; | 59 | extern int libata_noacpi; |