diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/eth16i.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 fb717be511f6..12d28e9d0cb7 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 |