diff --git a/[refs] b/[refs] index 6cd20ef93eb1..116d73c6c7d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e565f206082a725108a75bcf00bbe3db21a56474 +refs/heads/master: ebcad5aaea26da3cb2ca90b7f31a67a027eb60db diff --git a/trunk/include/linux/hdreg.h b/trunk/include/linux/hdreg.h index c37e9241fae7..ed21bd3dbd25 100644 --- a/trunk/include/linux/hdreg.h +++ b/trunk/include/linux/hdreg.h @@ -511,7 +511,6 @@ struct hd_driveid { unsigned short words69_70[2]; /* reserved words 69-70 * future command overlap and queuing */ - /* HDIO_GET_IDENTITY currently returns only words 0 through 70 */ unsigned short words71_74[4]; /* reserved words 71-74 * for IDENTIFY PACKET DEVICE command */