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
This commit is contained in:
Wolfgang Denk 2011-09-23 08:23:25 +02:00
commit 279bbbca12

View file

@ -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;