Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / common / cmd_pcmcia.c

diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index e448456971de91a237e976080417647ae499d990..ddc24be7d3d4012a9526a6963befd7a2dfc9b016 100644 (file)
--- a/common/cmd_pcmcia.c
+++ b/common/cmd_pcmcia.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  ********************************************************************
  *
@@ -66,7 +50,7 @@
 extern int pcmcia_on (void);
 extern int pcmcia_off (void);
 
-int do_pinit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_pinit (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rcode = 0;
 
@@ -90,8 +74,8 @@ U_BOOT_CMD(
        pinit,  2,      0,      do_pinit,
        "PCMCIA sub-system",
        "on  - power on PCMCIA socket\n"
-                       "pinit off - power off PCMCIA socket\n"
-         );
+       "pinit off - power off PCMCIA socket"
+);
 
 #endif