diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 19:57:54 +0100 |
| commit | 2dc94310bd94d0906febea7d0f7c188da620c952 (patch) | |
| tree | 6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/lne390.c | |
| parent | c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff) | |
| parent | fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff) | |
| download | op-kernel-dev-2dc94310bd94d0906febea7d0f7c188da620c952.zip op-kernel-dev-2dc94310bd94d0906febea7d0f7c188da620c952.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/lne390.c')
| -rw-r--r-- | drivers/net/lne390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c index c0ec7f6..5795ee1 100644 --- a/drivers/net/lne390.c +++ b/drivers/net/lne390.c @@ -188,7 +188,7 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr) } revision = (eisa_id >> 24) & 0x01; /* 0 = rev A, 1 rev B */ - + #if 0 /* Check the Mylex vendor ID as well. Not really required. */ if (inb(ioaddr + LNE390_SA_PROM + 0) != LNE390_ADDR0 @@ -341,7 +341,7 @@ lne390_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_ hdr->count = (hdr->count + 3) & ~3; /* Round up allocation. */ } -/* +/* * Block input and output are easy on shared memory ethercards, the only * complication is when the ring buffer wraps. The count will already * be rounded up to a doubleword value via lne390_get_8390_hdr() above. |
