diff options
| author | nadi <nadi@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 11:15:45 +0000 |
|---|---|---|
| committer | nadi <nadi@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-03 11:15:45 +0000 |
| commit | 770989de279f269d2725cb22fd18e640e10bde16 (patch) | |
| tree | ee895485133f94f67ffd1c8e00684359b6e2da9a /channels/misdn | |
| parent | 24f3d7d7d0b92fdcdd231463430a3bc212c0b804 (diff) | |
Merged revisions 59804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59804 | nadi | 2007-04-03 13:02:46 +0200 (Di, 03 Apr 2007) | 15 lines
Merged revisions 59788,59803 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59788 | nadi | 2007-04-03 11:37:00 +0200 (Di, 03 Apr 2007) | 2 lines
Use the new sysfs way of mISDN 1.2 to check if a port is NT or not.
........
r59803 | nadi | 2007-04-03 12:40:58 +0200 (Di, 03 Apr 2007) | 2 lines
ptp is the 5th bit, not the 4th.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59805 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/chan_misdn_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h index eacc22b3e..55c4166a7 100644 --- a/channels/misdn/chan_misdn_config.h +++ b/channels/misdn/chan_misdn_config.h @@ -83,7 +83,9 @@ enum misdn_cfg_elements { /* general config items */ MISDN_GEN_FIRST, +#ifndef MISDN_1_2 MISDN_GEN_MISDN_INIT, /* char[] */ +#endif MISDN_GEN_DEBUG, /* int */ MISDN_GEN_TRACEFILE, /* char[] */ MISDN_GEN_BRIDGING, /* int (bool) */ |