Merge branch 'master' into next

[J-u-boot.git] / common / cmd_license.c

diff --git a/common/cmd_license.c b/common/cmd_license.c
index 301af8d967cded56fd521df75d6cb688c647b0b7..c6f272ad34aa0429fd4a7d917d3aec0ed0638def 100644 (file)
--- a/common/cmd_license.c
+++ b/common/cmd_license.c
@@ -23,8 +23,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_LICENSE)
-
 /* COPYING is currently 15951 bytes in size */
 #define LICENSE_MAX    20480
 
@@ -53,7 +51,6 @@ int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(license, 1, 1, do_license,
-          "license - print GPL license text\n",
-          NULL);
-
-#endif /* CONFIG_CMD_LICENSE */
+       "print GPL license text",
+       ""
+);