ramips: sync 3.10 configs

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38181
This commit is contained in:
Gabor Juhos 2013-09-25 16:39:23 +00:00
parent 482b5f34e5
commit 76a1617063
3 changed files with 13 additions and 9 deletions

View File

@ -1,7 +1,6 @@
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y
@ -27,7 +26,7 @@ CONFIG_CPU_R4K_FPU=y
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K=y
CONFIG_DECOMPRESS_LZMA=y # CONFIG_DEBUG_PINCTRL is not set
CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NONCOHERENT=y
# CONFIG_DTB_RT2880_EVAL is not set # CONFIG_DTB_RT2880_EVAL is not set
CONFIG_DTB_RT_NONE=y CONFIG_DTB_RT_NONE=y
@ -37,9 +36,9 @@ CONFIG_GENERIC_ATOMIC64=y
CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_IO=y CONFIG_GENERIC_IO=y
CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVRES=y CONFIG_GPIO_DEVRES=y
@ -66,6 +65,7 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_GENERIC_HARDIRQS=y
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
CONFIG_HAVE_KVM=y
CONFIG_HAVE_MACH_CLKDEV=y CONFIG_HAVE_MACH_CLKDEV=y
CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
@ -75,6 +75,7 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_EVENTS=y
CONFIG_HW_HAS_PCI=y CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM=m
CONFIG_HZ_PERIODIC=y
CONFIG_IMAGE_CMDLINE_HACK=y CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE="" CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQCHIP=y CONFIG_IRQCHIP=y
@ -107,7 +108,6 @@ CONFIG_NET_RALINK_MDIO_RT2880=y
CONFIG_OF=y CONFIG_OF=y
CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS=y
CONFIG_OF_DEVICE=y CONFIG_OF_DEVICE=y
# CONFIG_OF_DISPLAY_TIMING is not set
CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y CONFIG_OF_GPIO=y
@ -115,15 +115,17 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y CONFIG_OF_MDIO=y
CONFIG_OF_MTD=y CONFIG_OF_MTD=y
CONFIG_OF_NET=y CONFIG_OF_NET=y
# CONFIG_OF_VIDEOMODE is not set
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_PERF_USE_VMALLOC=y CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
# CONFIG_PINCONF is not set
CONFIG_PINCTRL=y
CONFIG_PINCTRL_RT2880=y
# CONFIG_PINCTRL_SINGLE is not set
CONFIG_PINMUX=y
# CONFIG_PREEMPT_RCU is not set # CONFIG_PREEMPT_RCU is not set
CONFIG_RALINK=y CONFIG_RALINK=y
# CONFIG_RALINK_ILL_ACC is not set
# CONFIG_RALINK_USBPHY is not set
CONFIG_RALINK_WDT=y CONFIG_RALINK_WDT=y
# CONFIG_RCU_STALL_COMMON is not set # CONFIG_RCU_STALL_COMMON is not set
CONFIG_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y

View File

@ -34,6 +34,7 @@ CONFIG_DMA_NONCOHERENT=y
# CONFIG_DTB_RT305X_EVAL is not set # CONFIG_DTB_RT305X_EVAL is not set
CONFIG_DTB_RT_NONE=y CONFIG_DTB_RT_NONE=y
CONFIG_DTC=y CONFIG_DTC=y
# CONFIG_DWC_OTG is not set
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_ATOMIC64=y
CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS=y
@ -41,6 +42,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_GENERIC_IO=y CONFIG_GENERIC_IO=y
CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_DEVRES=y CONFIG_GPIO_DEVRES=y
@ -121,7 +123,7 @@ CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
# CONFIG_PINCONF is not set # CONFIG_PINCONF is not set
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_RALINK=y CONFIG_PINCTRL_RT2880=y
# CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_SINGLE is not set
CONFIG_PINMUX=y CONFIG_PINMUX=y
# CONFIG_PREEMPT_RCU is not set # CONFIG_PREEMPT_RCU is not set

View File

@ -128,7 +128,7 @@ CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
# CONFIG_PINCONF is not set # CONFIG_PINCONF is not set
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_RALINK=y CONFIG_PINCTRL_RT2880=y
# CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_SINGLE is not set
CONFIG_PINMUX=y CONFIG_PINMUX=y
# CONFIG_PREEMPT_RCU is not set # CONFIG_PREEMPT_RCU is not set