linux/generic: sync to todays yaffs tree

[openwrt.git] / target / linux / brcm47xx / config-2.6.32

diff --git a/target/linux/brcm47xx/config-2.6.32 b/target/linux/brcm47xx/config-2.6.32
index a5ea293..efc607b 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.32
+++ b/target/linux/brcm47xx/config-2.6.32
@@ -1,7 +1,7 @@
 
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set

-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set                                                          
+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set

 # CONFIG_AR7 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_AR7 is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set


@@ -69,6 +69,7 @@ CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 CONFIG_CSRC_R4K=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y

+CONFIG_DM_LOG_USERSPACE=n

 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y


@@ -124,6 +125,7 @@ CONFIG_MTD_BCM47XX=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

+CONFIG_PCI=y

 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set