On Wed, 22 Aug 2007 17:16:26 -0700 "Robin H. Johnson" <robbat2@xxxxxxxxxx> wrote: > On Wed, Aug 22, 2007 at 11:27:05PM +0100, Alan Cox wrote: > > static const struct pci_device_id marvell_pci_tbl[] = { > > { PCI_DEVICE(0x11AB, 0x6101), }, > > - { PCI_DEVICE(0x11AB, 0x6145), }, > Why is this ID being removed? > > Not that I have that model (I have 0x6101), it just looks weird given > the patch description to "Add another PCI identifier" and I thought I > should check. Merge error - well spotted. I'll send a further patch to put it back - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html