Merge tag 'uniphier-v2019.07' of git://git.denx.de/u-boot-uniphier

[oweals/u-boot.git] / drivers / net / fsl_mcdmafec.c

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 26c714cc04d2d72afb95df4e400309a112d07cb0..88309b186cda2e33e38debfb35e0576e184700a7 100644 (file)
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -1,14 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2007 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <environment.h>
 #include <malloc.h>
 #include <command.h>
 #include <config.h>
@@ -37,8 +37,6 @@
 
 #include "MCD_dma.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct fec_info_dma fec_info[] = {
 #ifdef CONFIG_SYS_FEC0_IOBASE
        {
@@ -391,7 +389,7 @@ static int fec_init(struct eth_device *dev, bd_t * bd)
        /* Set Opcode/Pause Duration Register */
        fecp->opd = 0x00010020;
 
-       /* Setup Buffers and Buffer Desriptors */
+       /* Setup Buffers and Buffer Descriptors */
        info->rxIdx = 0;
        info->txIdx = 0;