diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/ftape | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/char/ftape')
| -rw-r--r-- | drivers/char/ftape/lowlevel/fdc-io.c | 4 | ||||
| -rw-r--r-- | drivers/char/ftape/lowlevel/fdc-io.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c index 6890df0fa..c476c6441 100644 --- a/drivers/char/ftape/lowlevel/fdc-io.c +++ b/drivers/char/ftape/lowlevel/fdc-io.c @@ -54,7 +54,7 @@ int ftape_motor = 0; volatile int ftape_current_cylinder = -1; volatile fdc_mode_enum fdc_mode = fdc_idle; fdc_config_info fdc = {0}; -struct wait_queue *ftape_wait_intr = NULL; +DECLARE_WAIT_QUEUE_HEAD(ftape_wait_intr); unsigned int ft_fdc_base = CONFIG_FT_FDC_BASE; unsigned int ft_fdc_irq = CONFIG_FT_FDC_IRQ; @@ -385,7 +385,7 @@ int fdc_issue_command(const __u8 * out_data, int out_count, */ int fdc_interrupt_wait(unsigned int time) { - struct wait_queue wait = {current, NULL}; + DECLARE_WAITQUEUE(wait,current); sigset_t old_sigmask; static int resetting = 0; long timeout; diff --git a/drivers/char/ftape/lowlevel/fdc-io.h b/drivers/char/ftape/lowlevel/fdc-io.h index 77b2f5bb9..d7093b316 100644 --- a/drivers/char/ftape/lowlevel/fdc-io.h +++ b/drivers/char/ftape/lowlevel/fdc-io.h @@ -209,7 +209,7 @@ typedef struct { */ extern volatile fdc_mode_enum fdc_mode; extern int fdc_setup_error; /* outdated ??? */ -extern struct wait_queue *ftape_wait_intr; +extern wait_queue_head_t ftape_wait_intr; extern int ftape_motor; /* fdc motor line state */ extern volatile int ftape_current_cylinder; /* track nr FDC thinks we're on */ extern volatile __u8 fdc_head; /* FDC head */ |