On Thu, 2 Nov 2006 18:03:01 -0500
Jeff Garzik <jeff@xxxxxxxxxx> wrote:
>
> Please pull from 'upstream-linus' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
>
> to receive the following updates:
>
> drivers/ata/ahci.c | 8 ++++++++
> drivers/ata/pata_amd.c | 2 ++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> Peer Chen:
> [libata] Add support for PATA controllers of MCP67 to pata_amd.c.
> [libata] Add support for AHCI controllers of MCP67.
>
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 988f8bb..234197e 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -334,6 +334,14 @@ static const struct pci_device_id ahci_p
> { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci }, /* MCP65 */
> { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci }, /* MCP65 */
> { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci }, /* MCP65 */
> + { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x0557), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x0558), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x0559), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x055a), board_ahci }, /* MCP67 */
> + { PCI_VDEVICE(NVIDIA, 0x055b), board_ahci }, /* MCP67 */
>
> /* SiS */
> { PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */
> diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
> index 29234c8..5c47a9e 100644
> --- a/drivers/ata/pata_amd.c
> +++ b/drivers/ata/pata_amd.c
> @@ -677,6 +677,8 @@ static const struct pci_device_id amd[]
> { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE), 8 },
> { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE), 8 },
> { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE), 8 },
> + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE), 8 },
> + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE), 8 },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), 9 },
>
I think you'll find we're missing definitions for
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE (at least).
-
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
