summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/52xx
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-11-08 14:53:55 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-11-08 14:53:55 +1100
commitf81f5e14de1203b9389aad383aa3f7b2a221efdd (patch)
tree5f5b17f22eb6f1a3be65d16ff2b9f68b9a9e745f /arch/powerpc/platforms/52xx
parent9fce85f7ff94f1a877c15ad3d6ffbaed4b5cd1a6 (diff)
parent6ecc07b966977bb0855db1fa52d233c39fb3cafb (diff)
downloadtalos-obmc-linux-f81f5e14de1203b9389aad383aa3f7b2a221efdd.tar.gz
talos-obmc-linux-f81f5e14de1203b9389aad383aa3f7b2a221efdd.zip
Merge remote-tracking branch 'agust/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/52xx')
-rw-r--r--arch/powerpc/platforms/52xx/mpc5200_simple.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index e36d6e232ae6..846b789fb195 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -50,6 +50,7 @@ static void __init mpc5200_simple_setup_arch(void)
/* list of the supported boards */
static const char *board[] __initdata = {
+ "anon,charon",
"intercontrol,digsy-mtc",
"manroland,mucmc52",
"manroland,uc101",
OpenPOWER on IntegriCloud