diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
| commit | 898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3 (patch) | |
| tree | e6e666085abe674dbf6292555961fe0a0f2e2d2f /drivers/ata/libata.h | |
| parent | 08162e6a23d476544adfe1164afe9ea8b34ab859 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into next
Linux 3.4-rc5
Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a
Requested by Casey.
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 2e26fcaf635..9d0fd0b7185 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; |