fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / alpha / kernel / core_marvel.c

diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index bb4fe04..7f6a984 100644 (file)
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -118,7 +118,7 @@ alloc_io7(unsigned int pe)
 
        io7 = alloc_bootmem(sizeof(*io7));
        io7->pe = pe;
-       io7->irq_lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&io7->irq_lock);
 
        for (h = 0; h < 4; h++) {
                io7->ports[h].io7 = io7;
@@ -435,7 +435,7 @@ marvel_specify_io7(char *str)
                str = pchar;
        } while(*str);
 
-       return 0;
+       return 1;
 }
 __setup("io7=", marvel_specify_io7);