[PATCH 6/82] remove linux/version.h include from arch/ppc

Olaf Hering olh at suse.de
Mon Jul 11 05:35:14 EST 2005


changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

use system_utsname for CONFIG_BOOTX_TEXT welcome message

Signed-off-by: Olaf Hering <olh at suse.de>

arch/ppc/syslib/btext.c     |    6 ++++--
arch/ppc/syslib/prom.c      |    1 -
arch/ppc/syslib/prom_init.c |    1 -
3 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/btext.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/btext.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/btext.c
@@ -7,7 +7,7 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
+#include <linux/utsname.h>

#include <asm/sections.h>
#include <asm/bootx.h>
@@ -81,7 +81,9 @@ btext_welcome(void)
unsigned long pvr;
boot_infos_t* bi = &disp_bi;

-	btext_drawstring("Welcome to Linux, kernel " UTS_RELEASE "n");
+	btext_drawstring("Welcome to Linux, kernel ");
+	btext_drawstring(system_utsname.version);
+	btext_drawstring("n");
btext_drawstring("nlinked at        : 0x");
btext_drawhex(KERNELBASE);
btext_drawstring("nframe buffer at  : 0x");
Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/prom.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/ioport.h>
Index: linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom_init.c
===================================================================
--- linux-2.6.13-rc2-mm1.orig/arch/ppc/syslib/prom_init.c
+++ linux-2.6.13-rc2-mm1/arch/ppc/syslib/prom_init.c
@@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/ioport.h>



More information about the Linuxppc-dev mailing list