diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-08 04:53:55 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-08 04:53:55 +0100 |
| commit | f81f5e14de1203b9389aad383aa3f7b2a221efdd (patch) | |
| tree | 5f5b17f22eb6f1a3be65d16ff2b9f68b9a9e745f /arch/powerpc/platforms/52xx | |
| parent | powerpc/ps3: Fix lv1_gpu_attribute hcall (diff) | |
| parent | powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. (diff) | |
| download | linux-f81f5e14de1203b9389aad383aa3f7b2a221efdd.tar.xz 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.c | 1 |
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", |