diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
commit | 0a52ac8d181e938d640c2da70cad6d1301abe775 (patch) | |
tree | 046edf3437a49d3f6989d152bd94fcc80906b86d /drivers/net/at1700.c | |
parent | e81b795d44ba04beab7714de65ed2e377823bd37 (diff) | |
parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
download | kernel-crypto-0a52ac8d181e938d640c2da70cad6d1301abe775.tar.gz kernel-crypto-0a52ac8d181e938d640c2da70cad6d1301abe775.tar.xz kernel-crypto-0a52ac8d181e938d640c2da70cad6d1301abe775.zip |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/net/at1700.c')
-rw-r--r-- | drivers/net/at1700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 18b566ad4fd..cf30e278f18 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c @@ -318,7 +318,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) pos3 = mca_read_stored_pos( slot, 3 ); pos4 = mca_read_stored_pos( slot, 4 ); - for (l_i = 0; l_i < 0x09; l_i++) + for (l_i = 0; l_i < 8; l_i++) if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i]) break; ioaddr = at1700_mca_probe_list[l_i]; |