diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/isdn/hardware/eicon/pc.h | |
parent | TOMOYO: Fix infinite loop bug when reading /sys/kernel/security/tomoyo/audit (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
download | linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.xz linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/isdn/hardware/eicon/pc.h')
-rw-r--r-- | drivers/isdn/hardware/eicon/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h index 1c6945768a35..bf6b01812400 100644 --- a/drivers/isdn/hardware/eicon/pc.h +++ b/drivers/isdn/hardware/eicon/pc.h @@ -701,7 +701,7 @@ Byte | 8 7 6 5 4 3 2 1 #define PROTCAP_FREE12 0x1000 /* not used */ #define PROTCAP_FREE13 0x2000 /* not used */ #define PROTCAP_FREE14 0x4000 /* not used */ -#define PROTCAP_EXTENSION 0x8000 /* used for future extentions */ +#define PROTCAP_EXTENSION 0x8000 /* used for future extensions */ /* -----------------------------------------------------------* */ /* Onhook data transmission ETS30065901 */ /* Message Type */ |