am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit '696c75c165bbefd588b411103036b1193958ef6b':
  Remove a pre-uapi hack from nandread.
This commit is contained in:
Elliott Hughes 2014-02-08 05:37:51 +00:00 committed by Android Git Automerger
commit a1ebd4d5c8
1 changed files with 0 additions and 4 deletions

View File

@ -177,11 +177,7 @@ int nandread_main(int argc, char **argv)
if (rawmode) {
rawmode = mtdinfo.oobsize;
#if !defined(MTD_STUPID_LOCK) /* using uapi kernel headers */
ret = ioctl(fd, MTDFILEMODE, MTD_FILE_MODE_RAW);
#else /* still using old kernel headers */
ret = ioctl(fd, MTDFILEMODE, MTD_MODE_RAW);
#endif
if (ret) {
fprintf(stderr, "failed set raw mode for %s, %s\n",
devname, strerror(errno));