]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
[SCSI] DAC960: PCI id table fixup
authorBrian King <brking@us.ibm.com>
Mon, 18 Dec 2006 19:53:26 +0000 (20:53 +0100)
committerAdrian Bunk <bunk@stusta.de>
Mon, 18 Dec 2006 19:53:26 +0000 (20:53 +0100)
The PCI ID table in the DAC960 driver conflicts with some devices
that use the ipr driver. All ipr adapters that use this chip
have an IBM subvendor ID and all DAC960 adapters that use this
chip have a Mylex subvendor id.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/block/DAC960.c

index 37b8cda3e8bc909c02d38fbf02e99fded1d1d88a..babd29edeb0d79759955858fcfa90c449de138ad 100644 (file)
@@ -7118,7 +7118,7 @@ static struct pci_device_id DAC960_id_table[] = {
        {
                .vendor         = PCI_VENDOR_ID_MYLEX,
                .device         = PCI_DEVICE_ID_MYLEX_DAC960_GEM,
-               .subvendor      = PCI_ANY_ID,
+               .subvendor      = PCI_VENDOR_ID_MYLEX,
                .subdevice      = PCI_ANY_ID,
                .driver_data    = (unsigned long) &DAC960_GEM_privdata,
        },