drivers/video/cfb_console.c:Fix GCC 4.6 build warning

[u-boot] / drivers / qe / uec.h

diff --git a/drivers/qe/uec.h b/drivers/qe/uec.h
index 1568310090b94d9956c75c33236ed97ba1416c97..e63bf3a65220d55f34a970a92fb5278a8178d215 100644 (file)
--- a/drivers/qe/uec.h
+++ b/drivers/qe/uec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
+ * Copyright (C) 2006-2010 Freescale Semiconductor, Inc.
  *
  * Dave Liu <daveliu@freescale.com>
  * based on source code of Shlomi Gridish
@@ -23,6 +23,11 @@
 #ifndef __UEC_H__
 #define __UEC_H__
 
+#include "qe.h"
+#include "uccf.h"
+#include <phy.h>
+#include <asm/fsl_enet.h>
+
 #define MAX_TX_THREADS                         8
 #define MAX_RX_THREADS                         8
 #define MAX_TX_QUEUES                          8
@@ -657,24 +662,6 @@ typedef enum uec_num_of_threads {
        UEC_NUM_OF_THREADS_8  = 0x4   /* 8 */
 } uec_num_of_threads_e;
 
-/* UEC ethernet interface type
-*/
-typedef enum enet_interface {
-       ENET_10_MII,
-       ENET_10_RMII,
-       ENET_10_RGMII,
-       ENET_100_MII,
-       ENET_100_RMII,
-       ENET_100_RGMII,
-       ENET_1000_GMII,
-       ENET_1000_RGMII,
-       ENET_1000_RGMII_ID,
-       ENET_1000_RGMII_RXID,
-       ENET_1000_TBI,
-       ENET_1000_RTBI,
-       ENET_1000_SGMII
-} enet_interface_e;
-
 /* UEC initialization info struct
 */
 #define STD_UEC_INFO(num) \
@@ -692,7 +679,8 @@ typedef enum enet_interface {
        .tx_bd_ring_len         = 16,   \
        .rx_bd_ring_len         = 16,   \
        .phy_address            = CONFIG_SYS_UEC##num##_PHY_ADDR, \
-       .enet_interface         = CONFIG_SYS_UEC##num##_INTERFACE_MODE, \
+       .enet_interface_type    = CONFIG_SYS_UEC##num##_INTERFACE_TYPE, \
+       .speed                  = CONFIG_SYS_UEC##num##_INTERFACE_SPEED, \
 }
 
 typedef struct uec_info {
@@ -704,7 +692,8 @@ typedef struct uec_info {
        u16                             rx_bd_ring_len;
        u16                             tx_bd_ring_len;
        u8                              phy_address;
-       enet_interface_e                enet_interface;
+       phy_interface_t                 enet_interface_type;
+       int                             speed;
 } uec_info_t;
 
 /* UEC driver initialized info