summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2012-10-26 04:24:00 +0000
committerTom Rini <trini@ti.com>2012-11-02 15:20:39 -0700
commitaf8d1d3f71d27aafadab43e85076a9d0389d3d1b (patch)
treede47eb6662be8f98d3434dc1efded834cff10277 /common
parent044fc14bcbcd2a344a2e63c083852fb4af82b96d (diff)
downloadu-boot-imx-af8d1d3f71d27aafadab43e85076a9d0389d3d1b.zip
u-boot-imx-af8d1d3f71d27aafadab43e85076a9d0389d3d1b.tar.gz
u-boot-imx-af8d1d3f71d27aafadab43e85076a9d0389d3d1b.tar.bz2
ZFS: Fix compile warning in cmd_zfs.c (GCC 4.6.4 from ELDK 5.2.1)
This patch fixes the following compile warnings: cmd_zfs.c:177:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:177:1: warning: (near initialization for '_u_boot_list_cmd_zfsls.cmd') [enabled by default] cmd_zfs.c:182:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:182:1: warning: (near initialization for '_u_boot_list_cmd_zfsload.cmd') [enabled by default] Signed-off-by: Stefan Roese <sr@denx.de> Cc: Jorgen Lundman <lundman@lundman.net>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_zfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_zfs.c b/common/cmd_zfs.c
index d580f7b..1df0c4d 100644
--- a/common/cmd_zfs.c
+++ b/common/cmd_zfs.c
@@ -46,7 +46,7 @@
#define DOS_FS_TYPE_OFFSET 0x36
#define DOS_FS32_TYPE_OFFSET 0x52
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
char *filename = NULL;
int dev;
@@ -146,7 +146,7 @@ int zfs_print(const char *entry, const struct zfs_dirhook_info *data)
-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
const char *filename = "/";
int part;