projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[cascardo/linux.git]
/
drivers
/
sbus
/
char
/
vfc.h
diff --git
a/drivers/sbus/char/vfc.h
b/drivers/sbus/char/vfc.h
index
63941a2
..
f1aa138
100644
(file)
--- a/
drivers/sbus/char/vfc.h
+++ b/
drivers/sbus/char/vfc.h
@@
-126,7
+126,7
@@
struct vfc_dev {
volatile struct vfc_regs __iomem *regs;
struct vfc_regs *phys_regs;
unsigned int control_reg;
- struct
semaphore device_lock_sem
;
+ struct
mutex device_lock_mtx
;
int instance;
int busy;
unsigned long which_io;