Merged revisions 125982 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r125982 | mattf | 2008-06-27 14:00:44 -0500 (Fri, 27 Jun 2008) | 1 line

Obviously somebody didn't compile with libss7 support when doing the DAHDI conversion.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125983 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

@@ -9135,7 +9135,7 @@ static void ss7_start_call(struct dahdi_pvt *p, struct dahdi_ss7 *linkset)
 	char tmp[256];
 
 	if (ioctl(p->subs[SUB_REAL].zfd, DAHDI_AUDIOMODE, &law) == -1)
-		ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d: %s\n", p->channel, law, strrerror(errno));
+		ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d: %s\n", p->channel, law, strerror(errno));
 	
 	if (linkset->type == SS7_ITU)
 		law = DAHDI_LAW_ALAW;
@@ -13042,7 +13042,7 @@ static int linkset_addsigchan(int sigchan)
 			return -1;
 		}
 
-		ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDI, link->fds[curfd]);
+		ss7_add_link(link->ss7, SS7_TRANSPORT_ZAP, link->fds[curfd]);
 		link->numsigchans++;
 
 		memset(&si, 0, sizeof(si));