Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[mv-sheeva.git] / net / irda / irttp.c

diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index ce4647542b9e49e6ee0694354f87221b435bb17c..3d7ab03fb131e1b9000eef3ef3b47b8ac0d4f3b1 100644 (file)
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -109,7 +109,7 @@ int __init irttp_init(void)
  *    Called by module destruction/cleanup code
  *
  */
-void __exit irttp_cleanup(void)
+void irttp_cleanup(void)
 {
        /* Check for main structure */
        IRDA_ASSERT(irttp->magic == TTP_MAGIC, return;);
@@ -1875,7 +1875,7 @@ static int irttp_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations irttp_seq_ops = {
+static const struct seq_operations irttp_seq_ops = {
        .start  = irttp_seq_start,
        .next   = irttp_seq_next,
        .stop   = irttp_seq_stop,