diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/eth16i.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/eth16i.c')
| -rw-r--r-- | drivers/net/eth16i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index fb717be511f..12d28e9d0cb 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | This driver supports following cards : | 13 | This driver supports following cards : |
| 14 | - ICL EtherTeam 16i | 14 | - ICL EtherTeam 16i |
| 15 | - ICL EtherTeam 32 EISA | 15 | - ICL EtherTeam 32 EISA |
| 16 | (Uses true 32 bit transfers rather than 16i compability mode) | 16 | (Uses true 32 bit transfers rather than 16i compatibility mode) |
| 17 | 17 | ||
| 18 | Example Module usage: | 18 | Example Module usage: |
| 19 | insmod eth16i.o io=0x2a0 mediatype=bnc | 19 | insmod eth16i.o io=0x2a0 mediatype=bnc |