diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
commit | 421a8ddd1fc901897eee73965b442af4b4dd7095 (patch) | |
tree | e9bd7aef46f35c1857700b9c52ad24f6a68f957c /include/linux/ata.h | |
parent | 82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff) | |
parent | d439e869d612dd7a338ac75a4afc3646a5e67370 (diff) |
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
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 */ |