diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 5ad3ff8f0..618b7c551 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -844,14 +844,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL_TRAP=y diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 9492ccdba..1c67057ce 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -940,14 +940,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 90d4da56a..7108e915a 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -709,14 +709,6 @@ CONFIG_SKGE=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_PPPOATM is not set # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 0b6a417c2..87dd85bb4 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -562,14 +562,6 @@ CONFIG_E1000=m CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOATM=m ## ## file: drivers/net/appletalk/Kconfig diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index a020b9636..0f08ec3b5 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -497,15 +497,6 @@ CONFIG_MII=y # CONFIG_S2IO is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index d094afdfe..512de1567 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -640,16 +640,6 @@ CONFIG_ATL1=m # CONFIG_NETDEV_10000 is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m -CONFIG_PPPOL2TP=m # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m # CONFIG_NETCONSOLE_DYNAMIC is not set diff --git a/debian/config/config b/debian/config/config index c85e3538e..c2fc6deab 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1003,13 +1003,21 @@ CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_SLIP_MODE_SLIP6=y -CONFIG_PPPOL2TP=m CONFIG_NETCONSOLE_DYNAMIC=y ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 86810f53f..8fb00f828 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -335,13 +335,6 @@ CONFIG_BNX2=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/i386/config b/debian/config/i386/config index 0d35868b8..ef380ceb5 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1132,14 +1132,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 27a886d8e..503372a8c 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -549,13 +549,6 @@ CONFIG_DEFXX=m CONFIG_SKFP=m # CONFIG_HIPPI is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 504f8a04e..d3eed8230 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -125,10 +125,6 @@ CONFIG_DUMMY=m # CONFIG_BONDING is not set CONFIG_EQUALIZER=m # CONFIG_TUN is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index 9741fc8a3..b6635625e 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -147,9 +147,6 @@ CONFIG_APNE=m # CONFIG_NET_ISA is not set # CONFIG_NET_PCI is not set CONFIG_PLIP=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m ## ## file: drivers/net/arcnet/Kconfig diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index e03cf17da..cf7bed2f1 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -99,9 +99,6 @@ CONFIG_SERIO_LIBPS2=y CONFIG_NET_ETHERNET=y CONFIG_ATARILANCE=y # CONFIG_PLIP is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m ## ## file: drivers/parport/Kconfig diff --git a/debian/config/m68k/config.bvme6000 b/debian/config/m68k/config.bvme6000 index 874408f5f..359037ba2 100644 --- a/debian/config/m68k/config.bvme6000 +++ b/debian/config/m68k/config.bvme6000 @@ -71,9 +71,6 @@ CONFIG_SERIO_LIBPS2=m ## CONFIG_NET_ETHERNET=y CONFIG_BVME6000_NET=y -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m ## ## file: drivers/scsi/Kconfig diff --git a/debian/config/m68k/config.hp b/debian/config/m68k/config.hp index 2f1f02d48..f7e162c8f 100644 --- a/debian/config/m68k/config.hp +++ b/debian/config/m68k/config.hp @@ -25,9 +25,6 @@ CONFIG_IP_PNP_RARP=y CONFIG_IPX=m # CONFIG_IPX_INTERN is not set CONFIG_NET_ETHERNET=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_HIL_OLD is not set diff --git a/debian/config/m68k/config.mac b/debian/config/m68k/config.mac index e79a61f26..4ebab997a 100644 --- a/debian/config/m68k/config.mac +++ b/debian/config/m68k/config.mac @@ -99,9 +99,6 @@ CONFIG_MAC89x0=y CONFIG_MACSONIC=y # switched back on as requested by Finn Thain CONFIG_MACMACE=y # CONFIG_NET_VENDOR_SMC is not set -CONFIG_PPP_FILTER=y -# CONFIG_PPP_ASYNC is not set -# CONFIG_PPP_SYNC_TTY is not set ## ## file: drivers/net/appletalk/Kconfig diff --git a/debian/config/m68k/config.mvme147 b/debian/config/m68k/config.mvme147 index fe5019dba..a67dfc965 100644 --- a/debian/config/m68k/config.mvme147 +++ b/debian/config/m68k/config.mvme147 @@ -66,9 +66,6 @@ CONFIG_SERIO_LIBPS2=m ## CONFIG_NET_ETHERNET=y CONFIG_MVME147_NET=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m ## ## file: drivers/scsi/Kconfig diff --git a/debian/config/m68k/config.mvme16x b/debian/config/m68k/config.mvme16x index ff77ff28f..92234c815 100644 --- a/debian/config/m68k/config.mvme16x +++ b/debian/config/m68k/config.mvme16x @@ -72,9 +72,6 @@ CONFIG_SERIO_LIBPS2=m ## CONFIG_NET_ETHERNET=y CONFIG_MVME16x_NET=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m ## ## file: drivers/scsi/Kconfig diff --git a/debian/config/m68k/config.q40 b/debian/config/m68k/config.q40 index 8bf042bff..d01d71486 100644 --- a/debian/config/m68k/config.q40 +++ b/debian/config/m68k/config.q40 @@ -62,9 +62,6 @@ CONFIG_NET_ETHERNET=y CONFIG_NE2000=m # CONFIG_NET_PCI is not set # CONFIG_TR is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set CONFIG_MOUSE_PS2=m diff --git a/debian/config/m68k/config.sun3 b/debian/config/m68k/config.sun3 index 791ff3193..194f780a8 100644 --- a/debian/config/m68k/config.sun3 +++ b/debian/config/m68k/config.sun3 @@ -14,9 +14,6 @@ CONFIG_IPX=m CONFIG_NET_ETHERNET=y CONFIG_SUN3LANCE=y CONFIG_SUN3_82586=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_SUNKBD=y CONFIG_MOUSE_PS2=m diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 8edaf313c..493d95737 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1126,15 +1126,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index c40f8480f..e1e79ceff 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1355,15 +1355,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index c15b126a1..0974cca8d 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -633,14 +633,6 @@ CONFIG_BNX2=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index a549eeb6b..2752716f4 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -1125,15 +1125,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index a89decd3d..c7519ac1f 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -1354,15 +1354,6 @@ CONFIG_HIPPI=y CONFIG_ROADRUNNER=m # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 2662c0cce..7afd23f4f 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -572,14 +572,6 @@ CONFIG_VIA_RHINE=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m # CONFIG_NET_FC is not set CONFIG_NETCONSOLE=m CONFIG_NETPOLL=y diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 7871ae7f3..6bf338895 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -635,14 +635,6 @@ CONFIG_BNX2=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index 27ffdffc3..1048cd5db 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -632,14 +632,6 @@ CONFIG_BNX2=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 05654be4e..78e88670b 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -608,14 +608,6 @@ CONFIG_DEFXX=m CONFIG_SKFP=m CONFIG_HIPPI=y # CONFIG_ROADRUNNER is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOATM=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETPOLL_TRAP=y diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 215c77b59..97a4b478c 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -131,13 +131,6 @@ CONFIG_SUNQE=m CONFIG_BNX2=m # CONFIG_HIPPI is not set CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m CONFIG_NET_FC=y CONFIG_NETCONSOLE=m # CONFIG_NETPOLL_TRAP is not set