topconfig centralize ATALK
add the missing definitions to topconfig and thus nuke dupes. Reported-by: Martin Michlmayr <tbm@cyrius.com> svn path=/dists/trunk/linux-2.6/; revision=13047
This commit is contained in:
parent
86601bf4dd
commit
3a4a897d90
|
@ -784,16 +784,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL_TRAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=y
|
||||
CONFIG_LTPC=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -930,14 +930,6 @@ CONFIG_NETCONSOLE=m
|
|||
# CONFIG_NETPOLL_TRAP is not set
|
||||
CONFIG_VIRTIO_NET=m
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -519,14 +519,6 @@ CONFIG_NET_ETHERNET=y
|
|||
# CONFIG_HP100 is not set
|
||||
# CONFIG_NET_PCI is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -510,14 +510,6 @@ CONFIG_ENC28J60=m
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -317,14 +317,6 @@ CONFIG_MV643XX_ETH=m
|
|||
# CONFIG_NETDEV_10000 is not set
|
||||
CONFIG_NETCONSOLE=m
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1268,7 +1268,12 @@ CONFIG_WIRELESS=y
|
|||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=y
|
||||
CONFIG_LTPC=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/can/Kconfig
|
||||
|
|
|
@ -1115,15 +1115,6 @@ CONFIG_NETCONSOLE=m
|
|||
# CONFIG_NETPOLL_TRAP is not set
|
||||
CONFIG_VIRTIO_NET=m
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_LTPC=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -122,11 +122,6 @@ CONFIG_EQUALIZER=m
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
|
||||
##
|
||||
## file: drivers/net/wan/Kconfig
|
||||
##
|
||||
|
|
|
@ -962,15 +962,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1179,15 +1179,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -961,15 +961,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -1179,15 +1179,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_DEV_APPLETALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -558,14 +558,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
CONFIG_NETPOLL_TRAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
CONFIG_IPDDP=m
|
||||
CONFIG_IPDDP_ENCAP=y
|
||||
CONFIG_IPDDP_DECAP=y
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
|
@ -135,12 +135,6 @@ CONFIG_NET_FC=y
|
|||
CONFIG_NETCONSOLE=m
|
||||
# CONFIG_NETPOLL_TRAP is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/appletalk/Kconfig
|
||||
##
|
||||
CONFIG_ATALK=m
|
||||
# CONFIG_DEV_APPLETALK is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/arcnet/Kconfig
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue