diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
| commit | 864b6e70253ae07b58bb126d29a35be22f50f453 (patch) | |
| tree | 21f2021685284c01035f1cf03c1ff0b3c66da008 /include/linux/ata.h | |
| parent | 405b4c1452cb59ce07632a60d3e3152ab9243ae6 (diff) | |
| parent | 421a8ddd1fc901897eee73965b442af4b4dd7095 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.03-android
Diffstat (limited to 'include/linux/ata.h')
| -rw-r--r-- | include/linux/ata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index f2f4d8da97c0..f7ff6554a354 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -484,8 +484,8 @@ enum ata_tf_protocols { }; enum ata_ioctls { - ATA_IOC_GET_IO32 = 0x309, - ATA_IOC_SET_IO32 = 0x324, + ATA_IOC_GET_IO32 = 0x309, /* HDIO_GET_32BIT */ + ATA_IOC_SET_IO32 = 0x324, /* HDIO_SET_32BIT */ }; /* core structures */ |