Merge branch 't-ml-master' into t-master

[u-boot] / drivers / net / bfin_mac.h

diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index b1623e0408b12e8209fc4e402488af21d6afd671..8f467a309e12d33ab3229a9c2681e01cd190379f 100644 (file)
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -35,7 +35,10 @@ typedef struct adi_ether_frame_buffer {
 typedef struct dma_descriptor {
        struct dma_descriptor *NEXT_DESC_PTR;
        u32 START_ADDR;
-       ADI_DMA_CONFIG_REG CONFIG;
+       union {
+               u16 CONFIG_DATA;
+               ADI_DMA_CONFIG_REG CONFIG;
+       };
 } DMA_DESCRIPTOR;
 /* 10 bytes/struct in 12 bytes */
 
@@ -58,6 +61,6 @@ static void bfin_EMAC_halt(struct eth_device *dev);
 static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length);
 static int bfin_EMAC_recv(struct eth_device *dev);
 
-static void bfin_EMAC_setup_addr(bd_t *bd);
+void bfin_EMAC_setup_addr(uchar *enetaddr);
 
 #endif