kernel: move CONFIG_NET_IP_TUNNEL to generic
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37465 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
d959aa2e75
commit
184460f01e
|
@ -216,7 +216,6 @@ CONFIG_NET_DSA=y
|
|||
CONFIG_NET_DSA_MV88E6060=y
|
||||
CONFIG_NET_DSA_MV88E6063=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PCI=y
|
||||
|
|
|
@ -152,7 +152,6 @@ CONFIG_MTD_OF_PARTS=y
|
|||
CONFIG_MULTI_IRQ_HANDLER=y
|
||||
CONFIG_MUTEX_SPIN_ON_OWNER=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
|
|
|
@ -113,7 +113,6 @@ CONFIG_MTD_PHYSMAP=y
|
|||
# CONFIG_MTD_SM_COMMON is not set
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NO_EXCEPT_FILL=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
|
|
|
@ -2002,6 +2002,7 @@ CONFIG_NET_IPGRE_BROADCAST=y
|
|||
# CONFIG_NET_IPGRE_DEMUX is not set
|
||||
# CONFIG_NET_IPIP is not set
|
||||
# CONFIG_NET_IPVTI is not set
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
# CONFIG_NET_ISA is not set
|
||||
# CONFIG_NET_KEY is not set
|
||||
# CONFIG_NET_KEY_MIGRATE is not set
|
||||
|
|
|
@ -177,7 +177,6 @@ CONFIG_MXS_DMA=y
|
|||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_DMA is not set
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NLS=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
|
|
|
@ -225,7 +225,6 @@ CONFIG_MX3_IPU_IRQS=4
|
|||
CONFIG_MXS_DMA=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
# CONFIG_NET_DMA is not set
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NLS_CODEPAGE_437=y
|
||||
CONFIG_NO_HZ_COMMON=y
|
||||
|
|
|
@ -180,7 +180,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
|
|||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_MACH_IO_H=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NET_VENDOR_XSCALE=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
|
|
|
@ -112,7 +112,6 @@ CONFIG_MTD_PHYSMAP_OF=y
|
|||
CONFIG_MTD_UIMAGE_SPLIT=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NET_RALINK=y
|
||||
CONFIG_NET_RALINK_GSW_MT7620=y
|
||||
CONFIG_NET_RALINK_MDIO=y
|
||||
|
|
|
@ -102,7 +102,6 @@ CONFIG_MTD_PHYSMAP_OF=y
|
|||
CONFIG_MTD_UIMAGE_SPLIT=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NET_RALINK=y
|
||||
CONFIG_NET_RALINK_ESW_RT3052=y
|
||||
CONFIG_OF=y
|
||||
|
|
|
@ -103,7 +103,6 @@ CONFIG_MTD_PHYSMAP_OF=y
|
|||
CONFIG_MTD_UIMAGE_SPLIT=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEED_PER_CPU_KM=y
|
||||
# CONFIG_NET_IP_TUNNEL is not set
|
||||
CONFIG_NET_RALINK=y
|
||||
CONFIG_NET_RALINK_MDIO=y
|
||||
CONFIG_NET_RALINK_MDIO_RT2880=y
|
||||
|
|
Loading…
Reference in New Issue