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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
vfc.h
diff --git
a/drivers/sbus/char/vfc.h
b/drivers/sbus/char/vfc.h
index
e56a43a
..
8045cd5
100644
(file)
--- a/
drivers/sbus/char/vfc.h
+++ b/
drivers/sbus/char/vfc.h
@@
-125,12
+125,10
@@
struct vfc_regs {
struct vfc_dev {
struct vfc_dev {
- volatile struct vfc_regs *regs;
+ volatile struct vfc_regs
__iomem
*regs;
struct vfc_regs *phys_regs;
unsigned int control_reg;
struct semaphore device_lock_sem;
struct vfc_regs *phys_regs;
unsigned int control_reg;
struct semaphore device_lock_sem;
- struct timer_list poll_timer;
- wait_queue_head_t poll_wait;
int instance;
int busy;
unsigned long which_io;
int instance;
int busy;
unsigned long which_io;