diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 09:53:34 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 09:53:34 +0200 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /arch/powerpc/platforms/cell | |
| parent | powerpc: add context.vdso_base for 32-bit too (diff) | |
| parent | [PATCH] Fix for the PPTP hangs that have been reported (diff) | |
| download | linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.xz linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/platforms/cell')
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 6574b22b3cf3..fd3e5609e3e0 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -125,14 +125,13 @@ static void __init cell_init_early(void) static int __init cell_probe(void) { - /* XXX This is temporary, the Cell maintainer will come up with - * more appropriate detection logic - */ unsigned long root = of_get_flat_dt_root(); - if (!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0")) - return 0; - return 1; + if (of_flat_dt_is_compatible(root, "IBM,CBEA") || + of_flat_dt_is_compatible(root, "IBM,CPBW-1.0")) + return 1; + + return 0; } /* |