From 18a2f3cd9d408293206e79f582982c9a5fec3d8b Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sun, 22 Mar 2009 16:04:53 +0000 Subject: [PATCH] --- yaml --- r: 138559 b: refs/heads/master c: 151a9f4aef53fb9cc1e192c7d321c1d820232f4a h: refs/heads/master i: 138557: 4e52624f3436405492326754571e968ee46e00bf 138555: d2a2a5863259946c31a5cd9688a0f0df2367dabc 138551: ff095f14f327b3f67309e19ca65f569e22da293a 138543: 96acadfae08f0e3f49557512dfcd4dcdfa18a7cc 138527: 1b28391f4ab633861b51438b7de3416a6bbf1ddf 138495: dd4ac4b05883dbdf5573976ce9bbdaffaf978afd v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e04965ede2d1..4f5193acf468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e41d9597e7825ec20d690013d32bcec5f3fe16a +refs/heads/master: 151a9f4aef53fb9cc1e192c7d321c1d820232f4a diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 4d5ebb46b2c4..2e026c0407d4 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -2283,7 +2283,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, */ prom_init_stdout(); - prom_printf("Preparing to boot %s", PTRRELOC((char *)linux_banner)); + prom_printf("Preparing to boot %s", RELOC(linux_banner)); /* * Get default machine type. At this point, we do not differentiate