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 eee2e5125c7ddabcb0da285740db7bc98d816a5b..c9a3e12586582b3345bf49a529808ca039aaa8e1 100755 (executable)
--- 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 a4139bba2ab96e18595b546de634de37ef224ff2..325b4b85dd2e1f55cb6dd2635cdb5879e63643d9 100755 (executable)
--- 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