X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Facorn%2Fblock%2Ffd1772.c;h=3cd2e968e96c31dd24477343470834091f29ee5d;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=0e7a399d2470e69f015351408cfc63986ef521ef;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 0e7a399d2..3cd2e968e 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -138,9 +138,9 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
+#include <linux/bitops.h>
 
 #include <asm/arch/oldlatches.h>
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/hardware/ioc.h>
@@ -1522,7 +1522,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
 
 int fd1772_init(void)
 {
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+	static DEFINE_SPINLOCK(lock);
 	int i, err = -ENOMEM;
 
 	if (!machine_is_archimedes())