From: Josh Roberson <josh@asteriasgi.com>
Date: Sun, 20 Nov 2005 04:54:15 +0000 (+0000)
Subject: issue #5799
X-Git-Tag: 1.4.0-beta1~3289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f5afeaa8f7242cc079e846406654d43c3eabf5;p=thirdparty%2Fasterisk.git

issue #5799


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

diff --git a/ChangeLog b/ChangeLog
index eee2e5125c..c9a3e12586 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-19  Josh Roberson <josh@asteriasgi.com>
 
+	* channels/Makefile: Put chan_oss back into the default build. (issue #5799)
+
 	* funcs/func_enum.c: Fix long text description causing cosmetic defect on module load. (issue #5971)
 
 2005-11-19  Russell Bryant  <russell@digium.com>
diff --git a/channels/Makefile b/channels/Makefile
index a4139bba2a..325b4b85dd 100755
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -63,7 +63,8 @@ ifneq (${OSARCH},Darwin)
     ifneq (${OSARCH},CYGWIN)
 # the ISDN4Linux channel driver is probably broken on all modern kernels,
 # but if you wish to try to use it, uncomment the line below
-#      CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so 
+#      CHANNEL_LIBS+=chan_modem_i4l.so 
+       CHANNEL_LIBS+=chan_oss.so
     endif
   endif
 endif