From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 5 Feb 2013 07:47:59 +0000 (+0000)
Subject: mpc85xx: sync kernel config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eea43ffd336abe66593e20bedd8a77205db872ee;p=openwrt%2Fstaging%2Fnbd.git

mpc85xx: sync kernel config

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

SVN-Revision: 35493
---

diff --git a/target/linux/mpc85xx/config-3.7 b/target/linux/mpc85xx/config-3.7
index ace0f73186..ad577db4bc 100644
--- a/target/linux/mpc85xx/config-3.7
+++ b/target/linux/mpc85xx/config-3.7
@@ -14,6 +14,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
@@ -33,7 +34,6 @@ CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_E500=y
 CONFIG_EARLY_PRINTK=y
-CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPAPR_BOOT is not set
 CONFIG_FSL_BOOKE=y
@@ -54,13 +54,14 @@ CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_KERNEL_THREAD=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 # CONFIG_GENERIC_TBSYNC is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_TIME_VSYSCALL_OLD=y
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_GE_FPGA is not set
@@ -77,6 +78,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -92,6 +94,7 @@ CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -121,6 +124,7 @@ CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MMIO_NVRAM is not set
+CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MPC8536_DS is not set
 # CONFIG_MPC8540_ADS is not set
 # CONFIG_MPC8560_ADS is not set
@@ -240,7 +244,9 @@ CONFIG_SPE=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_STX_GP3 is not set
 CONFIG_SWIOTLB=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_TASK_SIZE=0xc0000000
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TQM8540 is not set
 # CONFIG_TQM8541 is not set
 # CONFIG_TQM8548 is not set
@@ -250,6 +256,7 @@ CONFIG_UCC=y
 CONFIG_UCC_FAST=y
 CONFIG_UCC_GETH=y
 # CONFIG_UGETH_TX_ON_DEMAND is not set
+CONFIG_UIDGID_CONVERTED=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VM_EVENT_COUNTERS=y