Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / net / irda / discovery.c

diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index f097341286740182d5726ebb2bb5e0c43fcf8e2a..80c33f408e3fc2ccee1059d6141728cda89d1a27 100644 (file)
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -202,7 +202,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
        /* Drop the spinlock before calling the higher layers, as
         * we can't guarantee they won't call us back and create a
         * deadlock. We will work on our own private data, so we
-        * don't care to be interupted. - Jean II */
+        * don't care to be interrupted. - Jean II */
        spin_unlock_irqrestore(&log->hb_spinlock, flags);
 
        if(buffer == NULL)
@@ -395,7 +395,7 @@ static int discovery_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations discovery_seq_ops = {
+static const struct seq_operations discovery_seq_ops = {
        .start  = discovery_seq_start,
        .next   = discovery_seq_next,
        .stop   = discovery_seq_stop,