aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-03-16 18:04:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-03-16 18:04:49 +0000
commit733f2f8c762c7e9cfd8ff60c4a53e165c88d320c (patch)
treee9b57351495a410f25b881545d9aba2fec88a7d1
parent3798de4df72f579c3a6e150acddf56724906fed7 (diff)
downloadupstream-733f2f8c762c7e9cfd8ff60c4a53e165c88d320c.tar.gz
upstream-733f2f8c762c7e9cfd8ff60c4a53e165c88d320c.tar.bz2
upstream-733f2f8c762c7e9cfd8ff60c4a53e165c88d320c.zip
mpc85xx: remove bogus config overrides
SVN-Revision: 26190
-rw-r--r--target/linux/mpc85xx/config-default20
1 files changed, 1 insertions, 19 deletions
diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 3b957b7357..8c08c30404 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -15,20 +15,15 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ARPD is not set
CONFIG_AUDIT_ARCH=y
CONFIG_BOOKE=y
CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_CMDLINE="console=ttyS0,115200"
CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT_BRK=y
# CONFIG_CPM2 is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEFAULT_UIMAGE=y
CONFIG_DEVKMEM=y
CONFIG_DNOTIFY=y
@@ -38,7 +33,6 @@ CONFIG_E500=y
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_EPOLL is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FREEZER=y
CONFIG_FSL_BOOKE=y
@@ -99,14 +93,7 @@ CONFIG_INET_TCP_DIAG=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INOTIFY_USER=y
CONFIG_IOMMU_HELPER=y
-CONFIG_IOSCHED_CFQ=y
# CONFIG_IPIC is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_MROUTE is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_RARP is not set
CONFIG_IRQ_PER_CPU=y
CONFIG_ISA_DMA_API=y
CONFIG_KERNEL_START=0xc0000000
@@ -150,7 +137,6 @@ CONFIG_OF_MDIO=y
# CONFIG_P4080_DS is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
-# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PCI=y
CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y
@@ -205,13 +191,11 @@ CONFIG_PROC_PAGE_MONITOR=y
CONFIG_QE_GPIO=y
CONFIG_QUICC_ENGINE=y
# CONFIG_RAPIDIO is not set
-# CONFIG_RD_LZMA is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_SBC8548 is not set
CONFIG_SBC8560=y
CONFIG_SCHED_HRTICK=y
# CONFIG_SCSI_DMA is not set
-CONFIG_SECCOMP=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_QE is not set
@@ -226,7 +210,6 @@ CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND_NVS=y
CONFIG_SWIOTLB=y
-# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_TASK_SIZE=0xc0000000
# CONFIG_TQM8540 is not set
# CONFIG_TQM8541 is not set
@@ -238,7 +221,6 @@ CONFIG_UCC_FAST=y
CONFIG_UCC_GETH=y
# CONFIG_UGETH_TX_ON_DEMAND is not set
CONFIG_USB_SUPPORT=y
-# CONFIG_VLAN_8021Q is not set
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_WATCHDOG is not set
CONFIG_WORD_SIZE=32