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/ap1000 | |
| 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/ap1000')
| -rw-r--r-- | drivers/ap1000/ap.c | 2 | ||||
| -rw-r--r-- | drivers/ap1000/ddv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ap1000/ap.c b/drivers/ap1000/ap.c index ce50c5edb..64340beda 100644 --- a/drivers/ap1000/ap.c +++ b/drivers/ap1000/ap.c @@ -36,7 +36,7 @@ #define NUM_APDEVS 8 #define MAX_REQUESTS 1 -static struct wait_queue * busy_wait = NULL; +static DECLARE_WAIT_QUEUE_HEAD(busy_wait); static int ap_blocksizes[NUM_APDEVS]; static int ap_length[NUM_APDEVS]; diff --git a/drivers/ap1000/ddv.c b/drivers/ap1000/ddv.c index 4a21a5882..f868076d3 100644 --- a/drivers/ap1000/ddv.c +++ b/drivers/ap1000/ddv.c @@ -84,7 +84,7 @@ static void ddv_request1(void); static char *ddv_opcodep = NULL; static struct request *next_request = NULL; -static struct wait_queue * busy_wait = NULL; +static DECLARE_WAIT_QUEUE_HEAD(busy_wait); static int ddv_blocksizes[NUM_DDVDEVS]; /* in bytes */ int ddv_sect_length[NUM_DDVDEVS]; /* in sectors */ @@ -93,7 +93,7 @@ int ddv_blk_length[NUM_DDVDEVS]; /* in blocks */ /* these are used by the ddv_daemon, which services remote disk requests */ static struct remote_request *rem_queue = NULL; static struct remote_request *rem_queue_end; -static struct wait_queue *ddv_daemon_wait = NULL; +static DECLARE_WAIT_QUEUE_HEAD(ddv_daemon_wait); static int opiu_kernel_loaded = 0; |