summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/Kconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-02-07 11:21:09 +1100
committerPaul Mackerras <paulus@samba.org>2008-02-07 11:21:09 +1100
commit1f7d4f8395093021ed2262296179cfe71bd5e2ec (patch)
tree30c69554b5a249ed5b90c52388165545df154c40 /arch/powerpc/platforms/Kconfig
parentb370b08274a25cf1e2015fb7ce65c43173c8156f (diff)
parent25ae3a0739c69425a911925b43213895a9802b98 (diff)
downloadblackbird-op-linux-1f7d4f8395093021ed2262296179cfe71bd5e2ec.tar.gz
blackbird-op-linux-1f7d4f8395093021ed2262296179cfe71bd5e2ec.zip
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.25
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r--arch/powerpc/platforms/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 045b8c80eeaf..fcedbec07f94 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -42,6 +42,7 @@ config CLASSIC32
source "arch/powerpc/platforms/pseries/Kconfig"
source "arch/powerpc/platforms/iseries/Kconfig"
source "arch/powerpc/platforms/chrp/Kconfig"
+source "arch/powerpc/platforms/512x/Kconfig"
source "arch/powerpc/platforms/52xx/Kconfig"
source "arch/powerpc/platforms/powermac/Kconfig"
source "arch/powerpc/platforms/prep/Kconfig"
OpenPOWER on IntegriCloud