diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:25 +0200 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /drivers/scsi/a2091.c | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| download | lwn-6c009ecef8cca28c7c09eb16d0802e37915a76e1.tar.gz lwn-6c009ecef8cca28c7c09eb16d0802e37915a76e1.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/a2091.c')
| -rw-r--r-- | drivers/scsi/a2091.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 37dd47136fb1..4b38c4750f77 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c @@ -23,6 +23,8 @@ #define DMA(ptr) ((a2091_scsiregs *)((ptr)->base)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) +static int a2091_release(struct Scsi_Host *instance); + static irqreturn_t a2091_intr (int irq, void *_instance) { unsigned long flags; @@ -144,7 +146,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, } } -int __init a2091_detect(struct scsi_host_template *tpnt) +static int __init a2091_detect(struct scsi_host_template *tpnt) { static unsigned char called = 0; struct Scsi_Host *instance; @@ -233,7 +235,7 @@ static struct scsi_host_template driver_template = { #include "scsi_module.c" -int a2091_release(struct Scsi_Host *instance) +static int a2091_release(struct Scsi_Host *instance) { #ifdef MODULE DMA(instance)->CNTR = 0; |