diff --git a/[refs] b/[refs] index 0e9767576c50..ecd59f1bddcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4e9cffa161da806cb4bc9df4a4e49d287156bfa +refs/heads/master: 12323cacca2014dcf517d1988fcdb8e44a1f497b diff --git a/trunk/arch/mips/basler/excite/excite_iodev.c b/trunk/arch/mips/basler/excite/excite_iodev.c index 6af0b21ebc32..476d20e08d0e 100644 --- a/trunk/arch/mips/basler/excite/excite_iodev.c +++ b/trunk/arch/mips/basler/excite/excite_iodev.c @@ -48,7 +48,7 @@ static DECLARE_WAIT_QUEUE_HEAD(wq); -static struct file_operations fops = +static const struct file_operations fops = { .owner = THIS_MODULE, .open = iodev_open, diff --git a/trunk/arch/mips/kernel/proc.c b/trunk/arch/mips/kernel/proc.c index 34dd22838fdb..36f065398243 100644 --- a/trunk/arch/mips/kernel/proc.c +++ b/trunk/arch/mips/kernel/proc.c @@ -90,7 +90,7 @@ static void c_stop(struct seq_file *m, void *v) { } -struct seq_operations cpuinfo_op = { +const struct seq_operations cpuinfo_op = { .start = c_start, .next = c_next, .stop = c_stop,