From 84748e6d47935f0f09c1f979bb405ef8eabf5f1b Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 11 Feb 2010 13:31:47 +0000
Subject: [PATCH] mpc83xx: sync kernel config

SVN-Revision: 19585
---
 target/linux/mpc83xx/config-default | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
index 141966cac2..cabe25f2d8 100644
--- a/target/linux/mpc83xx/config-default
+++ b/target/linux/mpc83xx/config-default
@@ -24,7 +24,6 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BITREVERSE=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
-# CONFIG_BRIQ_PANEL is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"
@@ -81,7 +80,6 @@ CONFIG_HAVE_LMB=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_COUNTERS=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-# CONFIG_HVC_RTAS is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
@@ -92,7 +90,6 @@ CONFIG_IPIC=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
 # CONFIG_JFFS2_FS is not set
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KMETER1 is not set
@@ -112,8 +109,8 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_MPC837x_MDS is not set
 CONFIG_MPC837x_RDB=y
 # CONFIG_MPC8xxx_GPIO is not set
+# CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
-CONFIG_MPIC=y
 # CONFIG_MTD_NAND_FSL_ELBC is not set
 # CONFIG_MTD_NAND_FSL_UPM is not set
 CONFIG_MTD_NAND_RB_PPC=y
@@ -134,7 +131,6 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PERF_COUNTERS is not set
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
@@ -158,25 +154,23 @@ CONFIG_PPC_DISABLE_WERROR=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_FPU=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
-CONFIG_PPC_I8259=y
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_LIB_RHEAP=y
 # CONFIG_PPC_MM_SLICES is not set
-CONFIG_PPC_MPC106=y
+# CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_MPC834x=y
 CONFIG_PPC_MPC837x=y
-CONFIG_PPC_NATIVE=y
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set
-CONFIG_PPC_RTAS=y
+# CONFIG_PPC_RTAS is not set
 CONFIG_PPC_STD_MMU_32=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_UDBG_16550=y
-CONFIG_PPC_WERROR=y
 CONFIG_PPC=y
 # CONFIG_PQ2ADS is not set
 CONFIG_PRINT_STACK_DEPTH=64
@@ -185,8 +179,6 @@ CONFIG_QE_GPIO=y
 CONFIG_QUICC_ENGINE=y
 CONFIG_RB_IOMAP=y
 CONFIG_RB_PPC=y
-# CONFIG_RTAS_ERROR_LOGGING is not set
-CONFIG_RTAS_PROC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SATA_FSL is not set
 # CONFIG_SBC834x is not set
@@ -204,8 +196,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
 # CONFIG_UCC_GETH is not set
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-# CONFIG_WATCHDOG_RTAS is not set
 CONFIG_WORD_SIZE=32
 # CONFIG_YAFFS_9BYTE_TAGS is not set
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set