diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:43 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:43 +0100 |
| commit | 38b7fa2a7ce5170a89bff26cc1fb5d9ba3ba1662 (patch) | |
| tree | edd615bb4e267a327c299d0dca650fbae6174c85 /drivers | |
| parent | 5af2ca472cccce7ba602ac83e6884f57d0995f28 (diff) | |
| parent | bba0859a996589e9673717864d104a7603687941 (diff) | |
Merge branch 'tracking-armlt-misc-fixes' into lsk-3.10-vexpress
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index dfbf978315d..bdd703c6bf1 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -1896,7 +1896,7 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr, SMC_SELECT_BANK(lp, 1); val = SMC_GET_BASE(lp); val = ((val & 0x1F00) >> 3) << SMC_IO_SHIFT; - if (((unsigned int)ioaddr & (0x3e0 << SMC_IO_SHIFT)) != val) { + if (((unsigned long)ioaddr & (0x3e0 << SMC_IO_SHIFT)) != val) { printk("%s: IOADDR %p doesn't match configuration (%x).\n", CARDNAME, ioaddr, val); } |