[SCSI] initio: fix conflict when loading driver
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 14 Dec 2007 00:14:05 +0000 (16:14 -0800)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 18 Dec 2007 22:04:11 +0000 (16:04 -0600)
commit99f1f534922a2f2251ba05b14657a1c62882a80e
tree3dc6ac3dbd9417e94ad880b7aab245986b3e7d8f
parentcedefa13db502432905c29819c195f46805b13eb
[SCSI] initio: fix conflict when loading driver

> I have a scanner connected to a Initio INI-950 SCSI card and I recently
> upgraded from SuSE 10.2 to 10.3.  The new kernel doesn't see any of my
> devices.  I get the following in /var/log/messages:
>
> ACPI: PCI Interrupt 0000:00:0a.0[A] -> GSI 17 (level, low) -> IRQ 16
> initio: I/O port range 0x0 is busy.
> ACPI: PCI interrupt for device 0000:00:0a.0 disabled

Humm not a collision - thats a bug in the driver updating.  Looks like the
changes I made and combined with Christoph's lost a line somewhere when I
was merging it all.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/initio.c