git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm26
/
kernel
/
setup.c
diff --git
a/arch/arm26/kernel/setup.c
b/arch/arm26/kernel/setup.c
index
4eb329e
..
466ddb5
100644
(file)
--- a/
arch/arm26/kernel/setup.c
+++ b/
arch/arm26/kernel/setup.c
@@
-8,7
+8,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/ioport.h>
@@
-18,7
+17,7
@@
#include <linux/console.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#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>
#include <linux/init.h>
#include <linux/root_dev.h>
@@
-144,7
+143,7
@@
static void __init setup_processor(void)
dump_cpu_info();
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;
sprintf(elf_platform, "%s", list->elf_name);
elf_hwcap = list->elf_hwcap;