Fix the confilcts when merging 'master' into hpc2.

[u-boot] / common / cmd_portio.c

diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index ad84b81dc2d36cc96463756ef5825ac562657161..d2e4c4b50434e1cbe8c6efe98eaf79a7e370bd4b 100644 (file)
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -95,8 +95,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,8 +159,8 @@ 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"