summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-21 14:45:18 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 10:18:15 -0500
commit74e738e8cc3d48cfc6c330c8a2b083c105cfd13d (patch)
tree4b403c44aa27edbb8c7a74420e92fbae55e99304
parent3f9eb617cb452ae5edf80ee842c6d309a451c4b5 (diff)
downloadu-boot-imx-74e738e8cc3d48cfc6c330c8a2b083c105cfd13d.zip
u-boot-imx-74e738e8cc3d48cfc6c330c8a2b083c105cfd13d.tar.gz
u-boot-imx-74e738e8cc3d48cfc6c330c8a2b083c105cfd13d.tar.bz2
drivers/net/armada100_fec.c: Fix compile warning
Fix this: armada100_fec.c: In function 'armada100_fec_register': armada100_fec.c:723:12: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com>
-rw-r--r--drivers/net/armada100_fec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 52be3a7..d318a36 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -558,8 +558,7 @@ static void armdfec_halt(struct eth_device *dev)
clrbits_le32(&regs->pconf, PCR_EN);
}
-static int armdfec_send(struct eth_device *dev, volatile void *dataptr,
- int datasize)
+static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize)
{
struct armdfec_device *darmdfec = to_darmdfec(dev);
struct armdfec_reg *regs = darmdfec->regs;