kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches...

[openwrt.git] / target / linux / mpc83xx / config-default

diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
index c37f3a6..eb1889f 100644 (file)
--- a/target/linux/mpc83xx/config-default
+++ b/target/linux/mpc83xx/config-default
@@ -3,7 +3,6 @@
 CONFIG_6xx=y
 # CONFIG_8xxx_WDT is not set
 # CONFIG_ADVANCED_OPTIONS is not set
 CONFIG_6xx=y
 # CONFIG_8xxx_WDT is not set
 # CONFIG_ADVANCED_OPTIONS is not set

-# CONFIG_AGP is not set

 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y


@@ -20,42 +19,30 @@ CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASP834x is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASP834x is not set

-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y

 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y

-CONFIG_BASE_SMALL=0
-# CONFIG_BINARY_PRINTF is not set

 CONFIG_BITREVERSE=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
 CONFIG_BITREVERSE=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y

-# CONFIG_BRIQ_PANEL is not set

 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"

-# CONFIG_CPU_FREQ is not set
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set

 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVPORT=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVPORT=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y

-# CONFIG_EDAC is not set

 # CONFIG_EMBEDDED6xx is not set
 # CONFIG_EMBEDDED6xx is not set

+CONFIG_EXTRA_TARGETS="uImage.fit.mpc8377_wlan"

 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FSL_EMB_PERFMON is not set
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_FSL_SOC=y
 # CONFIG_FSL_ULI1575 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FSL_EMB_PERFMON is not set
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_FSL_SOC=y
 # CONFIG_FSL_ULI1575 is not set

+# CONFIG_FSNOTIFY is not set
+CONFIG_GENERIC_ATOMIC64=y

 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y


@@ -63,6 +50,7 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y

+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

 # CONFIG_GENERIC_IOMAP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_GENERIC_IOMAP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_NVRAM=y


@@ -89,28 +77,24 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_LMB=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_LMB=y

-CONFIG_HAVE_MLOCK=y

 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y

+CONFIG_HAVE_PERF_COUNTERS=y

 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

-# CONFIG_HVC_RTAS is not set
-# CONFIG_HVC_UDBG is not set

 CONFIG_HW_RANDOM=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IPIC=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IPIC=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y

-# CONFIG_ISA is not set
-# CONFIG_JFFS2_FS is not set

 CONFIG_KERNEL_START=0xc0000000
 CONFIG_KERNEL_START=0xc0000000

+# CONFIG_KMETER1 is not set

 # CONFIG_LEDS_GPIO is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LOWMEM_SIZE=0x30000000

-# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0

 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set


@@ -122,68 +106,68 @@ CONFIG_LOWMEM_SIZE=0x30000000
 # CONFIG_MPC836x_MDS is not set
 # CONFIG_MPC836x_RDK is not set
 # CONFIG_MPC837x_MDS is not set
 # CONFIG_MPC836x_MDS is not set
 # CONFIG_MPC836x_RDK is not set
 # CONFIG_MPC837x_MDS is not set

-# CONFIG_MPC837x_RDB is not set
+CONFIG_MPC837x_RDB=y

 # CONFIG_MPC8xxx_GPIO is not set
 # CONFIG_MPC8xxx_GPIO is not set

+# CONFIG_MPIC is not set

 # CONFIG_MPIC_WEIRD is not set
 # CONFIG_MPIC_WEIRD is not set

-CONFIG_MPIC=y
-# CONFIG_MTD_CFI is not set

 # CONFIG_MTD_NAND_FSL_ELBC is not set
 # CONFIG_MTD_NAND_FSL_UPM is not set
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_FSL_ELBC is not set
 # CONFIG_MTD_NAND_FSL_UPM is not set
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_NAND=y

-# CONFIG_MTD_OF_PARTS is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NVRAM is not set
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MV643XX_ETH is not set

 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y

+CONFIG_OF_MDIO=y

 CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m
 CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m

-# CONFIG_PATA_SCH is not set
+CONFIG_PCI=y

 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y

-# CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
-CONFIG_PCSPKR_PLATFORM=y
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEPORTBUS=y
+# CONFIG_PERF_COUNTERS is not set

 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000

-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set

 CONFIG_PPC32=y
 CONFIG_PPC32=y

-CONFIG_PPC_4K_PAGES=y

 # CONFIG_PPC64 is not set
 # CONFIG_PPC64 is not set

-# CONFIG_PPC_64K_PAGES is not set

 # CONFIG_PPC_82xx is not set
 CONFIG_PPC_83xx=y
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set
 # CONFIG_PPC_82xx is not set
 CONFIG_PPC_83xx=y
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set

+CONFIG_PPC_BOOK3S_32=y

 CONFIG_PPC_BOOK3S=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_PPC_BOOK3S=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set

-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set

 # CONFIG_PPC_CLOCK is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_CLOCK is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_DCR_NATIVE is not set

+CONFIG_PPC_DISABLE_WERROR=y

 # CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_FPU=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 CONFIG_PPC_FPU=y

-CONFIG_PPC_I8259=y
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
+# CONFIG_PPC_I8259 is not set

 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_LIB_RHEAP=y
 # CONFIG_PPC_MM_SLICES is not set
 # CONFIG_PPC_INDIRECT_IO is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_LIB_RHEAP=y
 # CONFIG_PPC_MM_SLICES is not set

-CONFIG_PPC_MPC106=y
+# CONFIG_PPC_MPC106 is not set

 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_MPC834x=y
 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_MPC834x=y

-CONFIG_PPC_NATIVE=y
+CONFIG_PPC_MPC837x=y

 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set

-CONFIG_PPC_RTAS=y
+# CONFIG_PPC_RTAS is not set

 CONFIG_PPC_STD_MMU_32=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_STD_MMU_32=y
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_UDBG_16550=y


@@ -195,8 +179,6 @@ CONFIG_QE_GPIO=y
 CONFIG_QUICC_ENGINE=y
 CONFIG_RB_IOMAP=y
 CONFIG_RB_PPC=y
 CONFIG_QUICC_ENGINE=y
 CONFIG_RB_IOMAP=y
 CONFIG_RB_PPC=y

-# CONFIG_RTAS_ERROR_LOGGING is not set
-CONFIG_RTAS_PROC=y

 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SATA_FSL is not set
 # CONFIG_SBC834x is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SATA_FSL is not set
 # CONFIG_SBC834x is not set


@@ -210,17 +192,10 @@ CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_QE is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_QE is not set

-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SMP is not set
-# CONFIG_SQUASHFS is not set
+# CONFIG_SWIOTLB is not set

 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set

-CONFIG_TICK_ONESHOT=y
-CONFIG_TRACING_SUPPORT=y

 # CONFIG_UCC_GETH is not set
 # CONFIG_UCC_GETH is not set

-# CONFIG_UDBG_RTAS_CONSOLE is not set
-# CONFIG_WATCHDOG_RTAS is not set

 CONFIG_WORD_SIZE=32
 # CONFIG_YAFFS_9BYTE_TAGS is not set
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_WORD_SIZE=32
 # CONFIG_YAFFS_9BYTE_TAGS is not set
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set