From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 15 Jun 2009 06:43:49 +0000 (+0000)
Subject: resync kernel config
X-Git-Tag: reboot~23185
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0dac1a42848ccce29a40c1ba022161143c878da6;p=openwrt%2Fstaging%2Fjogo.git

resync kernel config

SVN-Revision: 16467
---

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index 7fbf456b8c..f366552b2d 100644
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -160,7 +160,6 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_PNP=y
@@ -178,7 +177,6 @@ CONFIG_KEXEC=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
-# CONFIG_LIB80211 is not set
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCK_KERNEL=y
 # CONFIG_LOCK_STAT is not set
@@ -205,60 +203,14 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MISC_DEVICES is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_OOPS is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_UBI is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set
-CONFIG_NLATTR=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=16
 CONFIG_NR_CPUS_DEFAULT_16=y
@@ -272,7 +224,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_STUB is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PLAN9AUTH is not set