commit a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73
author Elliott Hughes <enh@google.com> Sat Feb 08 05:37:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Feb 08 05:37:51 2014 +0000
tree bcdd22265d9554137770f6be75def9268b437243
parent ec04a8d45bc6b01c3c2cd4a3064d194f7beeb386
parent 696c75c165bbefd588b411103036b1193958ef6b

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

* commit '696c75c165bbefd588b411103036b1193958ef6b':
  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));