diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:40:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:40:58 -0800 |
| commit | 9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch) | |
| tree | 15c4222de2a2b2814c9430dcb4e997b18597881c /drivers/isdn/hardware | |
| parent | 7c2db36e730ee4facd341679ecb21ee73ba92831 (diff) | |
| parent | df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Assorted tiny fixes queued in trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
DocBook: update EXPORT_SYMBOL entry to point at export.h
Documentation: update top level 00-INDEX file with new additions
ARM: at91/ide: remove unsused at91-ide Kconfig entry
percpu_counter.h: comment code for better readability
x86, efi: fix comment typo in head_32.S
IB: cxgb3: delay freeing mem untill entirely done with it
net: mvneta: remove unneeded version.h include
time: x86: report_lost_ticks doesn't exist any more
pcmcia: avoid static analysis complaint about use-after-free
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
of: add missing documentation for of_platform_populate()
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
sound: soc: Fix typo in sound/codecs
treewide: Fix typo in various drivers
btrfs: fix comment typos
Update ibmvscsi module name in Kconfig.
powerpc: fix typo (utilties -> utilities)
of: fix spelling mistake in comment
h8300: Fix home page URL in h8300/README
xtensa: Fix home page URL in Kconfig
...
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/eicon/divacapi.h | 6 | ||||
| -rw-r--r-- | drivers/isdn/hardware/eicon/pc.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h index 3942efbbfb58..a315a2914d70 100644 --- a/drivers/isdn/hardware/eicon/divacapi.h +++ b/drivers/isdn/hardware/eicon/divacapi.h @@ -422,11 +422,11 @@ struct _DIVA_CAPI_ADAPTER { #define LAPD 6 /* lapd (Q.921) */ #define X25_L2 7 /* x.25 layer-2 */ #define V120_L2 8 /* V.120 layer-2 protocol */ -#define V42_IN 9 /* V.42 layer-2 protocol, incomming */ +#define V42_IN 9 /* V.42 layer-2 protocol, incoming */ #define V42 10 /* V.42 layer-2 protocol */ #define MDM_ATP 11 /* AT Parser built in the L2 */ #define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ -#define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ +#define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ #define RTPL2 14 /* RTP layer-2 protocol */ #define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ @@ -1125,7 +1125,7 @@ extern word li_total_channels; | Direction | word | Enable compression/decompression for | | | | 0: All direction | | | | 1: disable outgoing data | - | | | 2: disable incomming data | + | | | 2: disable incoming data | | | | 3: disable both direction (default) | +---------------------+------+-----------------------------------------+ | Number of code | word | Parameter P1 of V.42bis in accordance | diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h index 889dc984bbca..329c0c26abfb 100644 --- a/drivers/isdn/hardware/eicon/pc.h +++ b/drivers/isdn/hardware/eicon/pc.h @@ -419,11 +419,11 @@ struct dual #define LAPD 6 /* lapd (Q.921) */ #define X25_L2 7 /* x.25 layer-2 */ #define V120_L2 8 /* V.120 layer-2 protocol */ -#define V42_IN 9 /* V.42 layer-2 protocol, incomming */ +#define V42_IN 9 /* V.42 layer-2 protocol, incoming */ #define V42 10 /* V.42 layer-2 protocol */ #define MDM_ATP 11 /* AT Parser built in the L2 */ #define X75_V42BIS 12 /* x.75 with V.42bis */ -#define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ +#define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ #define RTPL2 14 /* RTP layer-2 protocol */ #define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ #define LISTENER 27 /* Layer 2 to listen line */ |