Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / net / ipv4 / udplite.c

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 7c1e0271c0dbf7dc9ccd2936038f387f2122cac0..72ce26b6c4d337b10533b95db0577a9c184cede3 100644 (file)
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -71,14 +71,16 @@ static struct inet_protosw udplite4_protosw = {
 };
 
 #ifdef CONFIG_PROC_FS
-static struct file_operations udplite4_seq_fops;
 static struct udp_seq_afinfo udplite4_seq_afinfo = {
-       .owner          = THIS_MODULE,
        .name           = "udplite",
        .family         = AF_INET,
        .hashtable      = udplite_hash,
-       .seq_show       = udp4_seq_show,
-       .seq_fops       = &udplite4_seq_fops,
+       .seq_fops       = {
+               .owner  =       THIS_MODULE,
+       },
+       .seq_ops        = {
+               .show           = udp4_seq_show,
+       },
 };
 
 static int udplite4_proc_init_net(struct net *net)