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/isdn/hardware/eicon/pc.h | |
| 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/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 | |||
| 701 | #define PROTCAP_FREE12 0x1000 /* not used */ | 701 | #define PROTCAP_FREE12 0x1000 /* not used */ |
| 702 | #define PROTCAP_FREE13 0x2000 /* not used */ | 702 | #define PROTCAP_FREE13 0x2000 /* not used */ |
| 703 | #define PROTCAP_FREE14 0x4000 /* not used */ | 703 | #define PROTCAP_FREE14 0x4000 /* not used */ |
| 704 | #define PROTCAP_EXTENSION 0x8000 /* used for future extentions */ | 704 | #define PROTCAP_EXTENSION 0x8000 /* used for future extensions */ |
| 705 | /* -----------------------------------------------------------* */ | 705 | /* -----------------------------------------------------------* */ |
| 706 | /* Onhook data transmission ETS30065901 */ | 706 | /* Onhook data transmission ETS30065901 */ |
| 707 | /* Message Type */ | 707 | /* Message Type */ |