Jaunty config changes: Build in PPP

[Tim Gardner]

>From d85ee69291fa131c2593fb4d2706ad86f615c56f Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Fri, 26 Dec 2008 13:37:42 -0700
Subject: [PATCH] UBUNTU: Build in PPP

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/config/amd64/config     |    4 ++--
 debian/config/i386/config      |    4 ++--
 debian/d-i/modules/ppp-modules |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b6c8b8f..a197064 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -2354,7 +2354,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PPDEV=m
-CONFIG_PPP=m
+CONFIG_PPP=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
 CONFIG_PPPOL2TP=m
@@ -2761,7 +2761,7 @@ CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
-CONFIG_SLHC=m
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 5a5bd6d..188eaf2 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -2486,7 +2486,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PPDEV=m
-CONFIG_PPP=m
+CONFIG_PPP=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
 CONFIG_PPPOL2TP=m
@@ -2954,7 +2954,7 @@ CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
-CONFIG_SLHC=m
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y
diff --git a/debian/d-i/modules/ppp-modules b/debian/d-i/modules/ppp-modules
index 2b6c6ed..eeedc11 100644
--- a/debian/d-i/modules/ppp-modules
+++ b/debian/d-i/modules/ppp-modules
@@ -1,6 +1,5 @@
 ppp_async
 ppp_deflate
-ppp_generic
 ppp_mppe
 pppoe
 pppox
-- 
1.5.6.3