aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-01-16 01:24:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-01-16 01:24:57 +0000
commit05ff3aad40d5e0b6f712d26d6b9ae048addc01a1 (patch)
treeffdf62c6b6972f18be6a538f292958763d31c15e
parentda09857f8d3039a021d16e58f4bd4648172f331b (diff)
downloadupstream-05ff3aad40d5e0b6f712d26d6b9ae048addc01a1.tar.gz
upstream-05ff3aad40d5e0b6f712d26d6b9ae048addc01a1.tar.bz2
upstream-05ff3aad40d5e0b6f712d26d6b9ae048addc01a1.zip
mpc85xx: clean up bogus kernel config overrides
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25016 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/mpc85xx/config-default25
1 files changed, 1 insertions, 24 deletions
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