diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:29:40 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:29:40 +0000 |
| commit | c38efc7ae4b053b48cd9f3e75fa43a829083ad4e (patch) | |
| tree | 02e772ecd458e198763239c3cd1c7685b938a5a0 | |
| parent | 14943bf40458aa60ebcc7c7a5840d6d4b4240551 (diff) | |
dahdi: Make CONFIG_DAHDI_PPP off by default.
Before CONFIG_DAHDI_PPP can be on by default, some more work needs to be
done to ensure that the ppp_generic module is not always loaded and
that all channels do not carry around all the PPP members unnecessarily.
(issue #17990)
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kevin P. Fleming <kpfleming@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9392
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9670 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | include/dahdi/dahdi_config.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index d477c71..6ec671b 100644 --- a/include/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h @@ -75,10 +75,6 @@ #endif #endif -#if defined(CONFIG_PPP) || defined(CONFIG_PPP_MODULE) -#define CONFIG_DAHDI_PPP -#endif - /* * Uncomment CONFIG_DAHDI_NET to enable SyncPPP, CiscoHDLC, and Frame Relay * support. @@ -95,7 +91,11 @@ /* * Uncomment for Generic PPP support (i.e. ZapRAS) */ + +#if defined(CONFIG_PPP) || defined(CONFIG_PPP_MODULE) /* #define CONFIG_DAHDI_PPP */ +#endif + /* * Uncomment to enable "watchdog" to monitor if interfaces * stop taking interrupts or otherwise misbehave |