backport chan_modem fixes from v1-2

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7129 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 4 deletions

diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
index bf8d00677..418433688 100755
--- a/configs/modules.conf.sample
+++ b/configs/modules.conf.sample
@@ -31,10 +31,14 @@ noload => pbx_kdeconsole.so
 ;
 noload => app_intercom.so
 ;
-; Explicitly load the chan_modem.so early on to be sure
-; it loads before any of the chan_modem_* 's afte rit
+; The 'modem' channel driver and its subdrivers are
+; obsolete, don't load them.
+;
+noload => chan_modem.so
+noload => chan_modem_aopen.so
+noload => chan_modem_bestdata.so
+noload => chan_modem_i4l.so
 ;
-;load => chan_modem.so
 load => res_musiconhold.so
 ;
 ; Load either OSS or ALSA, not both
@@ -47,4 +51,3 @@ noload => chan_alsa.so
 ; exported to modules loaded after them.
 ;
 [global]
-;chan_modem.so=yes