Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 624fae251f4e..c206a152ed9d 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -228,10 +228,10 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
                                          struct ipv6_txoptions * fopt)
 {
         struct ipv6_txoptions * fl_opt = fl->opt;
-        
+
         if (fopt == NULL || fopt->opt_flen == 0)
                 return fl_opt;
-        
+
         if (fl_opt != NULL) {
                 opt_space->hopopt = fl_opt->hopopt;
                 opt_space->dst0opt = fl_opt->dst0opt;
@@ -677,7 +677,7 @@ out_kfree:
         goto out;
 }
 
-static struct file_operations ip6fl_seq_fops = {
+static const struct file_operations ip6fl_seq_fops = {
         .owner          =       THIS_MODULE,
         .open           =       ip6fl_seq_open,
         .read           =       seq_read,