summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/40x/acadia_defconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 04:35:52 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 04:35:52 +0400
commit10f52dd9febf0302bc458a6ea7979767dfa9f3b6 (patch)
tree9048c0001147e958eb85a138e71237317a70fb54 /arch/powerpc/configs/40x/acadia_defconfig
parentec3cf2ece22a8ede7478bf38e2a818986322662b (diff)
parent336ff735425d2709c4bb3f2a55f7565e8170ce7a (diff)
downloadlinux-10f52dd9febf0302bc458a6ea7979767dfa9f3b6.tar.xz
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/configs/40x/acadia_defconfig')
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index a32ec8d323a0..173a5bb77ca1 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -252,7 +252,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