Merge git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / evb64260 / eth.h

diff --git a/board/evb64260/eth.h b/board/evb64260/eth.h
index ecc376213a55c82781b5e5be24df75db09c4f2d5..99581f0137618c03206929c3364edb7bdee59d5f 100644 (file)
--- a/board/evb64260/eth.h
+++ b/board/evb64260/eth.h
@@ -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+
  */
 
 /*
@@ -39,14 +23,14 @@ typedef struct eth0_tx_desc_struct {
        volatile struct eth0_tx_desc_struct * next_desc;
        /* Note - the following will not work for 64 bit addressing */
        volatile unsigned char * buff_pointer;
-} eth0_tx_desc_single __attribute__ ((packed));
+} __attribute__ ((packed)) eth0_tx_desc_single;
 
 typedef struct eth0_rx_desc_struct {
   volatile __u32 buff_size_byte_count;
   volatile __u32 command_status;
   volatile struct eth0_rx_desc_struct * next_desc;
   volatile unsigned char * buff_pointer;
-} eth0_rx_desc_single __attribute__ ((packed));
+} __attribute__ ((packed)) eth0_rx_desc_single;
 
 #define NT 20 /* Number of Transmit buffers */
 #define NR 20 /* Number of Receive buffers */
@@ -68,7 +52,7 @@ extern char *eth0_rx_buffer[NR];
 extern char *eth_data;
 
 extern int gt6426x_eth_poll(void *v);
-extern int gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s);
+extern int gt6426x_eth_transmit(void *v, char *p, unsigned int s);
 extern void gt6426x_eth_disable(void *v);
 extern int gt6426x_eth_probe(void *v, bd_t *bis);