Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / board / sandburst / metrobox / metrobox.h

diff --git a/board/sandburst/metrobox/metrobox.h b/board/sandburst/metrobox/metrobox.h
index cb7a83ce32910763a0725367c415239e22bb3ca9..d64f496c9abd0d74898be5267f76cd3c26828f52 100644 (file)
--- a/board/sandburst/metrobox/metrobox.h
+++ b/board/sandburst/metrobox/metrobox.h
@@ -4,23 +4,7 @@
  * (C) Copyright 2005
  * Travis B. Sawyer, Sandburst Corporation, tsawyer@sandburst.com
  *
- * 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+
  */
 
 typedef struct metrobox_board_id_s {
@@ -40,6 +24,6 @@ typedef struct opto_fpga_regs_s {
        volatile unsigned long scrmask_ul;      /* Read/Write */
        volatile unsigned long control_ul;      /* Read/Write */
        volatile unsigned long boardinfo_ul;    /* Read Only  */
-} OPTO_FPGA_REGS_ST __attribute__ ((packed)), *OPTO_FPGA_REGS_PST;
+} __attribute__ ((packed)) OPTO_FPGA_REGS_ST , *OPTO_FPGA_REGS_PST;
 
 #endif /* __METROBOX_H__ */