diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 08:53:12 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 08:53:19 (GMT) |
commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
tree | 061166d873d9da9cf83044a7593ad111787076c5 /arch/powerpc/platforms/44x/ppc44x_simple.c | |
parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
download | linux-fsl-qoriq-646b1db4956ba8bf748b835b5eba211133d91c2e.tar.xz |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'arch/powerpc/platforms/44x/ppc44x_simple.c')
-rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index e8c23cc..5f7a29d 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -61,7 +61,8 @@ static char *board[] __initdata = { "amcc,redwood", "amcc,sequoia", "amcc,taishan", - "amcc,yosemite" + "amcc,yosemite", + "mosaixtech,icon" }; static int __init ppc44x_probe(void) |