summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/44x/taishan_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-23 09:18:47 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-08-23 09:18:47 (GMT)
commit8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch)
treee7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /arch/powerpc/configs/44x/taishan_defconfig
parentc64b04fe6e0cb7c78e01751a44ef56cf20344e87 (diff)
parent422bef879e84104fee6dc68ded0e371dbeb5f88e (diff)
downloadlinux-fsl-qoriq-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.xz
Merge commit 'v2.6.31-rc7' into x86/cpu
Diffstat (limited to 'arch/powerpc/configs/44x/taishan_defconfig')
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 8267008..ef32cc4 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -260,7 +260,7 @@ CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCCARD is not set