From 425c30cf66e454e4cc0b6610feff576d2184ede7 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 23 Aug 2011 17:17:34 -0700 Subject: [PATCH] --- yaml --- r: 274927 b: refs/heads/master c: 93fad71c206ca4672360edaf918727b2b64f8ad1 h: refs/heads/master i: 274925: b2719871be3b3879b48f92ef8a762a1eb80610ea 274923: 87432d46d8acd1518a96cb8d5d7501b543b486f7 274919: efd7429c03e5b35338ad64630e39f78b2c817481 274911: 4084cb3d5844c5ec01b432bfb462df52c2d4bbe9 v: v3 --- [refs] | 2 +- trunk/include/mtd/mtd-abi.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 306c03a322ac..834e58669bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48ee688df09fa3ddf86b5b53508316d18d6fcedd +refs/heads/master: 93fad71c206ca4672360edaf918727b2b64f8ad1 diff --git a/trunk/include/mtd/mtd-abi.h b/trunk/include/mtd/mtd-abi.h index 2f7d45bcbd24..3bdda5c426bd 100644 --- a/trunk/include/mtd/mtd-abi.h +++ b/trunk/include/mtd/mtd-abi.h @@ -104,6 +104,12 @@ struct otp_info { __u32 locked; }; +/* + * Note, the following ioctl existed in the past and was removed: + * #define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) + * Try to avoid adding a new ioctl with the same ioctl number. + */ + #define MEMGETINFO _IOR('M', 1, struct mtd_info_user) #define MEMERASE _IOW('M', 2, struct erase_info_user) #define MEMWRITEOOB _IOWR('M', 3, struct mtd_oob_buf) @@ -112,7 +118,6 @@ struct otp_info { #define MEMUNLOCK _IOW('M', 6, struct erase_info_user) #define MEMGETREGIONCOUNT _IOR('M', 7, int) #define MEMGETREGIONINFO _IOWR('M', 8, struct region_info_user) -#define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) #define MEMGETOOBSEL _IOR('M', 10, struct nand_oobinfo) #define MEMGETBADBLOCK _IOW('M', 11, __kernel_loff_t) #define MEMSETBADBLOCK _IOW('M', 12, __kernel_loff_t)