[kernel] refresh 2.6.30 patches

[openwrt.git] / target / linux / cavium-octeon / config-default

diff --git a/target/linux/cavium-octeon/config-default b/target/linux/cavium-octeon/config-default
index c60d0c7..7fbf456 100644 (file)
--- a/target/linux/cavium-octeon/config-default
+++ b/target/linux/cavium-octeon/config-default
@@ -27,7 +27,6 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BRIDGE is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
@@ -120,7 +119,6 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FRAME_WARN=2048
-# CONFIG_FREEZER is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -134,7 +132,6 @@ CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
@@ -213,7 +210,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
@@ -261,7 +258,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
 CONFIG_NLATTR=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=16
@@ -272,10 +268,6 @@ CONFIG_OCTEON_ETHERNET=y
 CONFIG_OCTEON_MGMT=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set