summaryrefslogtreecommitdiffstats
path: root/drivers/dc2114x.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
commit77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch)
treee9563b2f28ea59062b90bb5712f141e8e9798aee /drivers/dc2114x.c
parent17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff)
downloadtalos-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz
talos-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip
Cleanup for GCC-4.x
Diffstat (limited to 'drivers/dc2114x.c')
-rw-r--r--drivers/dc2114x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dc2114x.c b/drivers/dc2114x.c
index 5386d9269b..c43cd5ec2f 100644
--- a/drivers/dc2114x.c
+++ b/drivers/dc2114x.c
@@ -214,7 +214,7 @@ int dc21x4x_initialize(bd_t *bis)
{
int idx=0;
int card_number = 0;
- int cfrv;
+ unsigned int cfrv;
unsigned char timer;
pci_dev_t devbusfn;
unsigned int iobase;
@@ -708,7 +708,7 @@ static int write_srom(struct eth_device *dev, u_long ioaddr, int index, int new_
#ifndef CONFIG_TULIP_FIX_DAVICOM
static void read_hw_addr(struct eth_device *dev, bd_t *bis)
{
- u_short tmp, *p = (short *)(&dev->enetaddr[0]);
+ u_short tmp, *p = (u_short *)(&dev->enetaddr[0]);
int i, j = 0;
for (i = 0; i < (ETH_ALEN >> 1); i++) {
OpenPOWER on IntegriCloud