topconfig centralize PPP options
were spread all over the place, with confliction decisions. dubious unset in s390. svn path=/dists/trunk/linux-2.6/; revision=11369
This commit is contained in:
parent
f726e5134a
commit
62cd30f371
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
##
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue