[backfire] ar71xx: merge r28380

[openwrt-10.03/.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 a5ea2931fe43f230d99c9e24fb954d9076b55b00..febf2ea7239d77c940c19fb6141de9e40a4ac72e 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.32
+++ b/target/linux/brcm47xx/config-2.6.32
@@ -69,6 +69,7 @@ CONFIG_CSRC_R4K_LIB=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
@@ -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_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set