Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274927
b: refs/heads/master
c: 93fad71
h: refs/heads/master
i:
  274925: b271987
  274923: 87432d4
  274919: efd7429
  274911: 4084cb3
v: v3
  • Loading branch information
Brian Norris authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 33c627f commit 425c30c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48ee688df09fa3ddf86b5b53508316d18d6fcedd
refs/heads/master: 93fad71c206ca4672360edaf918727b2b64f8ad1
7 changes: 6 additions & 1 deletion trunk/include/mtd/mtd-abi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 425c30c

Please sign in to comment.