Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / net / appletalk / atalk_proc.c

diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index dc4048dd98c1b60d68cf10ddcd1dadc169b48458..57ff8122b5c59b8da1e0d0a44abce1f38ef710b9 100644 (file)
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -8,7 +8,6 @@
  *     Free Software Foundation, version 2.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -241,7 +240,7 @@ static int atalk_seq_socket_open(struct inode *inode, struct file *file)
        return seq_open(file, &atalk_seq_socket_ops);
 }
 
-static struct file_operations atalk_seq_interface_fops = {
+static const struct file_operations atalk_seq_interface_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_interface_open,
        .read           = seq_read,
@@ -249,7 +248,7 @@ static struct file_operations atalk_seq_interface_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations atalk_seq_route_fops = {
+static const struct file_operations atalk_seq_route_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_route_open,
        .read           = seq_read,
@@ -257,7 +256,7 @@ static struct file_operations atalk_seq_route_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations atalk_seq_socket_fops = {
+static const struct file_operations atalk_seq_socket_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_socket_open,
        .read           = seq_read,
@@ -293,7 +292,7 @@ int __init atalk_proc_init(void)
        p->proc_fops = &atalk_seq_socket_fops;
 
        p = create_proc_entry("arp", S_IRUGO, atalk_proc_dir);
-       if (!p) 
+       if (!p)
                goto out_arp;
        p->proc_fops = &atalk_seq_arp_fops;