From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 16 Jan 2011 01:24:57 +0000 (+0000)
Subject: mpc85xx: clean up bogus kernel config overrides
X-Git-Tag: reboot~17869
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d80506e8d54216c4476f79d1da7145c08df74e64;p=openwrt%2Fstaging%2Fchunkeey.git

mpc85xx: clean up bogus kernel config overrides

SVN-Revision: 25016
---

diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 2b8e84c1cb..3b957b7357 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -25,26 +25,10 @@ CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_CPM2 is not set
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_DEV_TALITOS is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_ZLIB is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVKMEM=y
 CONFIG_DNOTIFY=y
@@ -127,6 +111,7 @@ CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KSI8560 is not set
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LOWMEM_CAM_NUM=3
@@ -152,9 +137,6 @@ CONFIG_MPIC=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 CONFIG_NEED_SG_DMA_LENGTH=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_NEW_LEDS is not set
 CONFIG_NR_IRQS=512
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
@@ -245,11 +227,7 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SWIOTLB=y
 # CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_TASK_SIZE=0xc0000000
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TQM8540 is not set
 # CONFIG_TQM8541 is not set
 # CONFIG_TQM8548 is not set
@@ -260,7 +238,6 @@ CONFIG_UCC_FAST=y
 CONFIG_UCC_GETH=y
 # CONFIG_UGETH_TX_ON_DEMAND is not set
 CONFIG_USB_SUPPORT=y
-CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_WATCHDOG is not set