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 eee2e5125..c9a3e1258 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 a4139bba2..325b4b85d 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