diff options
author | Wolfgang Denk <wd@denx.de> | 2010-08-03 22:45:13 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-03 22:45:13 +0200 |
commit | ac956293befb265b8958654d08c4ad52e605d46e (patch) | |
tree | 4fbfc08b1be8616bc5ee2032b53996ac0c5d64d8 /board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | |
parent | e9aecdec153ae166739858e6a570432449b979f7 (diff) | |
parent | 7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2 (diff) | |
download | u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.zip u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.tar.gz u-boot-imx-ac956293befb265b8958654d08c4ad52e605d46e.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c')
-rw-r--r-- | board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index 0b7f787..781a7c8 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -115,10 +115,8 @@ int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp, { unsigned int addr; - if (argc < 2) { - cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return cmd_usage(cmdtp); if (!strncmp(argv[1],"init",4)) { #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) |