diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 09:16:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 09:16:14 +0100 |
| commit | 2b45e0f9f34f718725e093f4e335600811d7105a (patch) | |
| tree | 3c6d594539eb16fc955906da65b9fa7aacbc9145 /drivers/scsi/a2091.c | |
| parent | arch/x86/mm/srat: Skip NUMA_NO_NODE while parsing SLIT (diff) | |
| parent | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-2b45e0f9f34f718725e093f4e335600811d7105a.tar.xz linux-2b45e0f9f34f718725e093f4e335600811d7105a.zip | |
Merge branch 'linus' into x86/urgent
Merge in the x86 changes to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/a2091.c')
| -rw-r--r-- | drivers/scsi/a2091.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 30fa38a0ad39..9176bfbd5745 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c @@ -201,7 +201,7 @@ static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent) instance->irq = IRQ_AMIGA_PORTS; instance->unique_id = z->slotaddr; - regs = (struct a2091_scsiregs *)ZTWO_VADDR(z->resource.start); + regs = ZTWO_VADDR(z->resource.start); regs->DAWR = DAWR_A2091; wdregs.SASR = ®s->SASR; |