Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / net / atm / lec.c

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 6d63afa5764d8f26462854852ad635f6def2794e..2770fb451ae87dbe089cc32a16eef523fb18a374 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -630,7 +630,7 @@ static struct atm_dev lecatm_dev = {
        .ops = &lecdev_ops,
        .type = "lec",
        .number = 999,          /* dummy device number */
-       .lock = SPIN_LOCK_UNLOCKED
+       .lock = __SPIN_LOCK_UNLOCKED(lecatm_dev.lock)
 };
 
 /*
@@ -1174,7 +1174,7 @@ static int lec_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations lec_seq_ops = {
+static const struct seq_operations lec_seq_ops = {
        .start = lec_seq_start,
        .next = lec_seq_next,
        .stop = lec_seq_stop,