From cd13695539100aa496d7141852a4278dec9ddd8b Mon Sep 17 00:00:00 2001 From: acoul Date: Tue, 27 Apr 2010 13:11:14 +0000 Subject: [PATCH 1/1] [backfire] merge r21188 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21190 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/rb532/config-2.6.32 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/linux/rb532/config-2.6.32 b/target/linux/rb532/config-2.6.32 index 30bc3a1a4..132c1ba78 100644 --- a/target/linux/rb532/config-2.6.32 +++ b/target/linux/rb532/config-2.6.32 @@ -16,7 +16,6 @@ CONFIG_ATA=y CONFIG_BITREVERSE=y CONFIG_BLK_DEV_SD=y CONFIG_BOOT_RAW=y -CONFIG_BRIDGE=m # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set @@ -89,8 +88,6 @@ CONFIG_HW_RANDOM=y CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y CONFIG_IMAGE_CMDLINE_HACK=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQ_CPU=y @@ -98,7 +95,6 @@ CONFIG_KEXEC=y CONFIG_KORINA=y # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_MIKROTIK_RB532=y -CONFIG_LLC=m # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -143,7 +139,6 @@ CONFIG_PCSPKR_PLATFORM=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set -# CONFIG_PROBE_INITRD_HEADER is not set CONFIG_RC32434_WDT=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCSI=y @@ -163,9 +158,6 @@ CONFIG_SCSI=y # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SWARM is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -CONFIG_STP=m # CONFIG_SWAP is not set CONFIG_SWAP_IO_SPACE=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y -- 2.35.1