summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2009-10-27 23:56:18 +0100
committerBenjamin Herrenschmidt2009-10-27 23:56:18 +0100
commit40578fca24e7f777f3da7a693b030ae28ef7e486 (patch)
treeed0541f857882f647bfc97e03d83371b8f4698a6 /arch/powerpc/platforms
parentpowerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule (diff)
parentpowerpc/5200: Update defconfigs (diff)
downloadkernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.gz
kernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.tar.xz
kernel-qcow2-linux-40578fca24e7f777f3da7a693b030ae28ef7e486.zip
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/52xx/mpc5200_simple.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index c31e5b534f0a..d45be5b5ad49 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -51,6 +51,8 @@ static void __init mpc5200_simple_setup_arch(void)
/* list of the supported boards */
static char *board[] __initdata = {
"intercontrol,digsy-mtc",
+ "manroland,mucmc52",
+ "manroland,uc101",
"phytec,pcm030",
"phytec,pcm032",
"promess,motionpro",