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

[people/ms/u-boot.git] / drivers / net / designware.c

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 07281a6ce9d2fa204e30c1cfee3e1b5258739485..bcae842389aae9de0f2f8e0425c6f9b27dba2775 100644 (file)
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -243,8 +243,10 @@ static int _dw_eth_init(struct dw_eth_dev *priv, u8 *enetaddr)
                mdelay(100);
        };
 
-       /* Soft reset above clears HW address registers.
-        * So we have to set it here once again */
+       /*
+        * Soft reset above clears HW address registers.
+        * So we have to set it here once again.
+        */
        _dw_write_hwaddr(priv, enetaddr);
 
        rx_descs_init(priv);
@@ -526,7 +528,7 @@ static int designware_eth_send(struct udevice *dev, void *packet, int length)
        return _dw_eth_send(priv, packet, length);
 }
 
-static int designware_eth_recv(struct udevice *dev, uchar **packetp)
+static int designware_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 {
        struct dw_eth_dev *priv = dev_get_priv(dev);