Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

[pandora-kernel.git] / net / rxrpc / ar-proc.c

diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
index 2e83ce3..017322e 100644 (file)
--- a/net/rxrpc/ar-proc.c
+++ b/net/rxrpc/ar-proc.c
@@ -14,7 +14,7 @@
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
 
-static const char *rxrpc_conn_states[] = {
+static const char *const rxrpc_conn_states[] = {
        [RXRPC_CONN_UNUSED]             = "Unused  ",
        [RXRPC_CONN_CLIENT]             = "Client  ",
        [RXRPC_CONN_SERVER_UNSECURED]   = "SvUnsec ",
@@ -98,12 +98,12 @@ static int rxrpc_call_seq_open(struct inode *inode, struct file *file)
        return seq_open(file, &rxrpc_call_seq_ops);
 }
 
-struct file_operations rxrpc_call_seq_fops = {
+const struct file_operations rxrpc_call_seq_fops = {
        .owner          = THIS_MODULE,
        .open           = rxrpc_call_seq_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release_private,
+       .release        = seq_release,
 };
 
 /*
@@ -183,10 +183,10 @@ static int rxrpc_connection_seq_open(struct inode *inode, struct file *file)
        return seq_open(file, &rxrpc_connection_seq_ops);
 }
 
-struct file_operations rxrpc_connection_seq_fops = {
+const struct file_operations rxrpc_connection_seq_fops = {
        .owner          = THIS_MODULE,
        .open           = rxrpc_connection_seq_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release_private,
+       .release        = seq_release,
 };