Merge branch 'patman' of git://git.denx.de/u-boot-x86

[karo-tx-uboot.git] / drivers / net / pcnet.c

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 45066c8feafd272ba2b07d81bb5f4ff0735f2d91..c028a44a9ecab332d46353ffe27746116da37f50 100644 (file)
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -141,8 +141,7 @@ static int pcnet_check (struct eth_device *dev)
 }
 
 static int pcnet_init (struct eth_device *dev, bd_t * bis);
-static int pcnet_send (struct eth_device *dev, volatile void *packet,
-                      int length);
+static int pcnet_send(struct eth_device *dev, void *packet, int length);
 static int pcnet_recv (struct eth_device *dev);
 static void pcnet_halt (struct eth_device *dev);
 static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_num);
@@ -415,8 +414,7 @@ static int pcnet_init (struct eth_device *dev, bd_t * bis)
        return 0;
 }
 
-static int pcnet_send (struct eth_device *dev, volatile void *packet,
-                      int pkt_len)
+static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 {
        int i, status;
        struct pcnet_tx_head *entry = &lp->tx_ring[lp->cur_tx];