git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
acorn
/
block
/
fd1772.c
diff --git
a/drivers/acorn/block/fd1772.c
b/drivers/acorn/block/fd1772.c
index
0e7a399
..
3cd2e96
100644
(file)
--- 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/types.h>
#include <linux/delay.h>
#include <linux/mm.h>
+#include <linux/bitops.h>
#include <asm/arch/oldlatches.h>
#include <asm/arch/oldlatches.h>
-#include <asm/bitops.h>
#include <asm/dma.h>
#include <asm/hardware.h>
#include <asm/hardware/ioc.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)
{
int fd1772_init(void)
{
- static
spinlock_t lock = SPIN_LOCK_UNLOCKED
;
+ static
DEFINE_SPINLOCK(lock)
;
int i, err = -ENOMEM;
if (!machine_is_archimedes())
int i, err = -ENOMEM;
if (!machine_is_archimedes())