diff options
| author | Eric Van Hensbergen <ericvh@gmail.com> | 2008-10-27 14:42:19 -0500 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@gmail.com> | 2008-10-27 14:42:19 -0500 |
| commit | 3b1cb5a66cb41c6a8eb976be57a28daf1208ac4c (patch) | |
| tree | 47bde8439e250ca77283f0782375f467e09787ff | |
| parent | 22fe64f2846cee4f80a6f1d0ebb00b7905de33af (diff) | |
| download | systemsim-2.6.26.tar.gz | |
systemsim: merge systemsim forward to 2.6.26systemsim-2.6.26
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 5d89686d9a3e94..19a3ae89b5a546 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -376,6 +376,7 @@ static int __init pSeries_probe(void) return 0; if (strcmp(dtype, "chrp")) return 0; +#endif /* Cell blades firmware claims to be chrp while it's not. Until this * is fixed, we need to avoid those here. |