commit f571a7ca3798c4aa0e573967db7126a0fdba41de
author Elliott Hughes <enh@google.com> Fri Mar 07 02:25:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:25:35 2014 +0000
tree 626917e4a7fb39703a1b89635f0b3d2a0f12bbec
parent 56521f882a2c36948d2aa8bd2f6cb8f77b878b30
parent 829ae5befa16efbd2ca4e974d702c2eaac3eab02

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

* commit '829ae5befa16efbd2ca4e974d702c2eaac3eab02':
  Remove a pre-uapi hack from nandread.

toolbox/nandread.c

diff --git a/toolbox/nandread.c b/toolbox/nandread.c
index d43b2fe..971c232 100644
--- a/toolbox/nandread.c
+++ b/toolbox/nandread.c
@@ -177,11 +177,7 @@
 
     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));