commit 6549de96d3cde54f946a6c9377128e25809b2b19
author Elliott Hughes <enh@google.com> Wed Apr 01 18:48:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 01 18:48:16 2015 +0000
tree d15b4a887609392bf89d07e312b0f08d9392528f
parent c99d70273769baa732cb84a7a605aaacdacb63aa
parent 1a09cc22ab66a94aba755641bf1f2a7a3b2876b9

am a57fb596: Merge "Remove no-op "capabilities"."

* commit 'a57fb596f31ae415446841b35dd8aefe8273b409':
  Remove no-op "capabilities".

init/init_parser.cpp

diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index 4e18e20..593f0c5 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -122,7 +122,6 @@
         break;
     case 'c':
         if (!strcmp(s, "opy")) return K_copy;
-        if (!strcmp(s, "apability")) return K_capability;
         if (!strcmp(s, "lass")) return K_class;
         if (!strcmp(s, "lass_start")) return K_class_start;
         if (!strcmp(s, "lass_stop")) return K_class_stop;
@@ -776,8 +775,6 @@
 
     kw = lookup_keyword(args[0]);
     switch (kw) {
-    case K_capability:
-        break;
     case K_class:
         if (nargs != 2) {
             parse_error(state, "class option requires a classname\n");

init/keywords.h

diff --git a/init/keywords.h b/init/keywords.h
index 34cb2ad..4bd0ba6 100644
--- a/init/keywords.h
+++ b/init/keywords.h
@@ -45,7 +45,6 @@
 enum {
     K_UNKNOWN,
 #endif
-    KEYWORD(capability,  OPTION,  0, 0)
     KEYWORD(class,       OPTION,  0, 0)
     KEYWORD(class_start, COMMAND, 1, do_class_start)
     KEYWORD(class_stop,  COMMAND, 1, do_class_stop)