Merge branch 'uboot'

[u-boot] / board / evb64260 / evb64260.c

diff --git a/board/evb64260/evb64260.c b/board/evb64260/evb64260.c
index 80756a5cdf5828e5499f3d5c68419e714545da1e..74f8819eac9a454ffede3439d058a3ac186433b6 100644 (file)
--- a/board/evb64260/evb64260.c
+++ b/board/evb64260/evb64260.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
  *
- * 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+
  */
 
 /*
@@ -32,6 +16,7 @@
 #include <galileo/gt64260R.h>
 #include <net.h>
 #include <netdev.h>
+#include <linux/compiler.h>
 
 #include <asm/io.h>
 #include "eth.h"
@@ -360,7 +345,7 @@ debug_led(int led, int mode)
 {
 #if !defined(CONFIG_ZUMA_V2) && !defined(CONFIG_P3G4)
        volatile int *addr = NULL;
-       int dummy;
+       __maybe_unused int dummy;
 
        if (mode == 1) {
                switch (led) {