[svn-commits] sruffell: branch linux/2.4 r9670 - /linux/branches/2.4/include/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jan 20 23:29:40 2011
New Revision: 9670

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9670
Log:
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 at digium.com>
Acked-by: Kevin P. Fleming <kpfleming at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9392

Modified:
    linux/branches/2.4/include/dahdi/dahdi_config.h

Modified: linux/branches/2.4/include/dahdi/dahdi_config.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/include/dahdi/dahdi_config.h?view=diff&rev=9670&r1=9669&r2=9670
==============================================================================
--- linux/branches/2.4/include/dahdi/dahdi_config.h (original)
+++ linux/branches/2.4/include/dahdi/dahdi_config.h Thu Jan 20 23:29:40 2011
@@ -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