]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
[PATCH] ppc: Fix boot with yaboot with ARCH=ppc
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Nov 2005 07:21:45 +0000 (18:21 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 16 Nov 2005 02:51:58 +0000 (13:51 +1100)
commitde93f0d62ccaa730fd46de14d46c0317bd82596a
tree38184c1a318f111abd0f20c541ea2e1b69da0b41
parentc0ce5c5228dd17d4e3dd1d15b8d52714262cab70
[PATCH] ppc: Fix boot with yaboot with ARCH=ppc

The merge of machine types broke boot with yaboot & ARCH=ppc due to the
old code still retreiving the old-syle machine type passed in by yaboot.
This patch fixes it by translating those old numbers. Since that whole
mecanism is deprecated, this is a temporary fix until ARCH=ppc uses the
new prom_init that the merged architecture now uses for both ppc32 and
ppc64 (after 2.6.15)

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/ppc/kernel/setup.c