diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-05 07:42:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-05 07:42:20 -0700 |
| commit | 107207aa8576963861e9f0c66b439d233f02a97d (patch) | |
| tree | f84c6421f1006b9c462494db425e987145067030 /drivers/sbus/char/vfc.h | |
| parent | 403fe5ae57c831968c3dbbaba291ae825a1c5aaa (diff) | |
| parent | 3873658be7b3896e88648664e480a44d12083ad8 (diff) | |
| download | kernel_samsung_smdk4412-107207aa8576963861e9f0c66b439d233f02a97d.zip kernel_samsung_smdk4412-107207aa8576963861e9f0c66b439d233f02a97d.tar.gz kernel_samsung_smdk4412-107207aa8576963861e9f0c66b439d233f02a97d.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/sbus/char/vfc.h')
| -rw-r--r-- | drivers/sbus/char/vfc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h index e56a43a..a7782e7 100644 --- a/drivers/sbus/char/vfc.h +++ b/drivers/sbus/char/vfc.h @@ -129,8 +129,6 @@ struct vfc_dev { 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; |