Merging Stelian Pop AT91 patches

[platform/kernel/u-boot.git] / common / cmd_portio.c

diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index ad84b81..a06cac0 100644 (file)
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -30,8 +30,6 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_PORTIO)
-
 extern int cmd_get_data_size (char *arg, int default_size);
 
 /* Display values from last command.
@@ -95,8 +93,8 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-cmd_tbl_t U_BOOT_CMD(PORTIO_OUT) = MK_CMD_ENTRY(
-       "out",  3,      1,      do_portio_out,
+U_BOOT_CMD(
+       out,    3,      1,      do_portio_out,
        "out     - write datum to IO port\n",
        "[.b, .w, .l] port value\n    - output to IO port\n"
 );
@@ -159,11 +157,9 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-cmd_tbl_t U_BOOT_CMD(PORTIO_IN) = MK_CMD_ENTRY(
-       "in",   2,      1,      do_portio_in,
+U_BOOT_CMD(
+       in,     2,      1,      do_portio_in,
        "in      - read data from an IO port\n",
        "[.b, .w, .l] port\n"
        "    - read datum from IO port\n"
 );
-
-#endif /* CFG_CMD_PORTIO */