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

1 files changed, 5 insertions, 5 deletions

diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 930ea59463ad..205106521ecb 100644
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -37,10 +37,10 @@
 
 #define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\
                               (prot == WANCONFIG_X25) ? " X25" : \
-                                 (prot == WANCONFIG_PPP) ? " PPP" : \
+                                 (prot == WANCONFIG_PPP) ? " PPP" : \
                                     (prot == WANCONFIG_CHDLC) ? " CHDLC": \
                                        (prot == WANCONFIG_MPPP) ? " MPPP" : \
-                                           " Unknown" )
+                                           " Unknown" )
 
 /****** Function Prototypes *************************************************/
 
@@ -188,7 +188,7 @@ static int status_open(struct inode *inode, struct file *file)
         return seq_open(file, &status_op);
 }
 
-static struct file_operations config_fops = {
+static const struct file_operations config_fops = {
         .owner   = THIS_MODULE,
         .open    = config_open,
         .read    = seq_read,
@@ -196,7 +196,7 @@ static struct file_operations config_fops = {
         .release = seq_release,
 };
 
-static struct file_operations status_fops = {
+static const struct file_operations status_fops = {
         .owner   = THIS_MODULE,
         .open    = status_open,
         .read    = seq_read,
@@ -271,7 +271,7 @@ static int wandev_open(struct inode *inode, struct file *file)
         return single_open(file, wandev_show, PDE(inode)->data);
 }
 
-static struct file_operations wandev_fops = {
+static const struct file_operations wandev_fops = {
         .owner   = THIS_MODULE,
         .open    = wandev_open,
         .read    = seq_read,