aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-09-23 08:23:25 +0200
committerWolfgang Denk <wd@denx.de>2011-09-23 08:23:25 +0200
commit279bbbca12e71ae68278b756048194003a6d6e21 (patch)
tree0f0f8a2dcbd57a3f001ecb84e06c2b57067d5426
parent7de17781a44b0f9f7139c24742ec75a84635e559 (diff)
parent513e6fd3eb98b74a71e2d83149f98c4e6fc3ce64 (diff)
downloadu-boot-linaro-stable-279bbbca12e71ae68278b756048194003a6d6e21.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm: OMAP3: beagle: Fix build warning in beagle.c
-rw-r--r--board/ti/beagle/beagle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 8cdceaf56..aa5047c66 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -486,7 +486,7 @@ int ehci_hcd_init(void)
* Returns - 1 if button is held down
* 0 if button is not held down
*/
-int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_userbutton(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int button = 0;
int gpio;