X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Farm26%2Fkernel%2Fsetup.c;h=466ddb54b44ffb01bd0c1211ddaf2f6ba80fc971;hb=60ca97584fcb98d2f1b14e4c2f12203dd5b3888e;hp=843c29fe9af5d1aaf6f78fb55dfcec35e33c97a4;hpb=b2f71bade430d468398167d696731bf770de2db8;p=powerpc.git

diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index 843c29fe9a..466ddb54b4 100644
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -17,7 +17,7 @@
 #include <linux/console.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/root_dev.h>
 
@@ -143,7 +143,7 @@ static void __init setup_processor(void)
 
 	dump_cpu_info();
 
-	sprintf(system_utsname.machine, "%s", list->arch_name);
+	sprintf(init_utsname()->machine, "%s", list->arch_name);
 	sprintf(elf_platform, "%s", list->elf_name);
 	elf_hwcap = list->elf_hwcap;