projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
alpha
/
kernel
/
setup.c
diff --git
a/arch/alpha/kernel/setup.c
b/arch/alpha/kernel/setup.c
index 74c3466256586800730be7e19c94421a2050b877..a449e999027c8e663af133f956996c94a70197fc 100644
(file)
--- a/
arch/alpha/kernel/setup.c
+++ b/
arch/alpha/kernel/setup.c
@@
-18,7
+18,6
@@
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/user.h>
-#include <linux/a.out.h>
#include <linux/screen_info.h>
#include <linux/delay.h>
#include <linux/mc146818rtc.h>
#include <linux/screen_info.h>
#include <linux/delay.h>
#include <linux/mc146818rtc.h>
@@
-1472,7
+1471,7
@@
c_stop(struct seq_file *f, void *v)
{
}
{
}
-struct seq_operations cpuinfo_op = {
+
const
struct seq_operations cpuinfo_op = {
.start = c_start,
.next = c_next,
.stop = c_stop,
.start = c_start,
.next = c_next,
.stop = c_stop,