aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xChangeLog2
-rwxr-xr-xchannels/Makefile3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7abcce3da..bcda32fa1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-11-20 Russell Bryant <russell@digium.com>
+ * channels/Makefile: Re-add chan_oss to the default build. (issue #5799)
+
* res/res_musiconhold.c: Fix incorrect argument for the buffer size to an ast_copy_string call (issue #5803)
* funcs/func_enum.c: Shorten the module description (issue #5791)
diff --git a/channels/Makefile b/channels/Makefile
index a4139bba2..c736dfa26 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