Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 52xx / mpc5200_simple.c

diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index c0aa04068d6936bc195bfe271acf21758f494e0b..9cf36020cf0d85e3e30a77629bbede3ea8f2262a 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -52,6 +52,7 @@ static void __init mpc5200_simple_setup_arch(void)
 static const char *board[] __initdata = {
        "anonymous,a4m072",
        "anon,charon",
+       "ifm,o2d",
        "intercontrol,digsy-mtc",
        "manroland,mucmc52",
        "manroland,uc101",