projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
frv
/
kernel
/
setup.c
diff --git
a/arch/frv/kernel/setup.c
b/arch/frv/kernel/setup.c
index
9f3a7a6
..
9f4a9a6
100644
(file)
--- a/
arch/frv/kernel/setup.c
+++ b/
arch/frv/kernel/setup.c
@@
-104,8
+104,6
@@
unsigned long __nongprelbss dma_coherent_mem_end;
unsigned long __initdata __sdram_old_base;
unsigned long __initdata num_mappedpages;
-struct cpuinfo_frv __nongprelbss boot_cpu_data;
-
char __initdata command_line[COMMAND_LINE_SIZE];
char __initdata redboot_command_line[COMMAND_LINE_SIZE];