topconfig: centralize SLIP settings
spread over all files and conflicting decisions, just keep s390 disabling.. svn path=/dists/trunk/linux-2.6/; revision=11368
This commit is contained in:
parent
420e45f302
commit
f726e5134a
|
@ -852,10 +852,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL_TRAP=y
|
||||
|
|
|
@ -948,10 +948,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
|
|
@ -13,13 +13,6 @@ CONFIG_ARM=y
|
|||
##
|
||||
# CONFIG_INPUT_FF_MEMLESS is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/Kconfig
|
||||
##
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/wireless/Kconfig
|
||||
##
|
||||
|
|
|
@ -717,7 +717,6 @@ CONFIG_PPP_ASYNC=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
# CONFIG_PPPOATM is not set
|
||||
CONFIG_SLIP=m
|
||||
# CONFIG_NET_FC is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -506,10 +506,6 @@ CONFIG_PPP_DEFLATE=m
|
|||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
# CONFIG_NET_FC is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -650,9 +650,6 @@ CONFIG_PPP_BSDCOMP=m
|
|||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_PPPOL2TP=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_NET_FC is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETCONSOLE_DYNAMIC is not set
|
||||
|
|
|
@ -9,13 +9,6 @@ CONFIG_ARM=y
|
|||
CONFIG_AEABI=y
|
||||
CONFIG_OABI_COMPAT=y
|
||||
|
||||
##
|
||||
## file: drivers/net/Kconfig
|
||||
##
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/wireless/Kconfig
|
||||
##
|
||||
|
|
|
@ -1005,6 +1005,10 @@ CONFIG_MLX4_DEBUG=y
|
|||
CONFIG_TEHUTI=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOE=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
CONFIG_PPPOL2TP=m
|
||||
CONFIG_NETCONSOLE_DYNAMIC=y
|
||||
|
||||
|
|
|
@ -342,10 +342,6 @@ CONFIG_PPP_ASYNC=m
|
|||
CONFIG_PPP_SYNC_TTY=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
# CONFIG_NET_FC is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -1140,10 +1140,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
|
|
@ -556,10 +556,6 @@ CONFIG_PPP_ASYNC=m
|
|||
CONFIG_PPP_SYNC_TTY=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
|
||||
|
|
|
@ -129,10 +129,6 @@ CONFIG_PPP=m
|
|||
# CONFIG_PPP_MULTILINK is not set
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
|
|
@ -1135,11 +1135,6 @@ CONFIG_PPP_DEFLATE=m
|
|||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -1364,11 +1364,6 @@ CONFIG_PPP_DEFLATE=m
|
|||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -641,10 +641,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
# CONFIG_NET_FC is not set
|
||||
# CONFIG_NETCONSOLE is not set
|
||||
# CONFIG_NETPOLL is not set
|
||||
|
|
|
@ -1134,11 +1134,6 @@ CONFIG_PPP_DEFLATE=m
|
|||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -1363,11 +1363,6 @@ CONFIG_PPP_DEFLATE=m
|
|||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLHC=m
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -580,10 +580,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
# CONFIG_NET_FC is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL=y
|
||||
|
|
|
@ -643,10 +643,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
# CONFIG_NET_FC is not set
|
||||
# CONFIG_NETCONSOLE is not set
|
||||
# CONFIG_NETPOLL is not set
|
||||
|
|
|
@ -640,10 +640,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_MPPE=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
CONFIG_SLIP_MODE_SLIP6=y
|
||||
# CONFIG_NET_FC is not set
|
||||
# CONFIG_NETCONSOLE is not set
|
||||
# CONFIG_NETPOLL is not set
|
||||
|
|
|
@ -616,10 +616,6 @@ CONFIG_PPP_SYNC_TTY=m
|
|||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPPOATM=m
|
||||
CONFIG_SLIP=m
|
||||
# CONFIG_SLIP_COMPRESSED is not set
|
||||
# CONFIG_SLIP_SMART is not set
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL_TRAP=y
|
||||
|
|
|
@ -138,10 +138,6 @@ CONFIG_PPP_ASYNC=m
|
|||
CONFIG_PPP_SYNC_TTY=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_SLIP=m
|
||||
CONFIG_SLIP_COMPRESSED=y
|
||||
CONFIG_SLIP_SMART=y
|
||||
# CONFIG_SLIP_MODE_SLIP6 is not set
|
||||
CONFIG_NET_FC=y
|
||||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
|
Loading…
Reference in New Issue