* Re: + sis5513-support-sis-965l.patch added to -mm tree
[not found] <200602030128.k131SaF5018921@shell0.pdx.osdl.net>
@ 2006-02-03 16:04 ` Thierry Vignaud
0 siblings, 0 replies; only message in thread
From: Thierry Vignaud @ 2006-02-03 16:04 UTC (permalink / raw)
To: linux-kernel; +Cc: rudolph, B.Zolnierkiewicz, davej, mm-commits
akpm@osdl.org writes:
> From: Rudolph Pereira <rudolph@faex.net>
>
> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
> Cc: Dave Jones <davej@codemonkey.org.uk>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
>
> drivers/ide/pci/sis5513.c | 6 ++++++
> 1 files changed, 6 insertions(+)
>
> diff -puN drivers/ide/pci/sis5513.c~sis5513-support-sis-965l drivers/ide/pci/sis5513.c
> --- 25/drivers/ide/pci/sis5513.c~sis5513-support-sis-965l Thu Feb 2 17:29:51 2006
> +++ 25-akpm/drivers/ide/pci/sis5513.c Thu Feb 2 17:29:51 2006
> @@ -780,7 +780,12 @@ static unsigned int __devinit init_chips
> pci_write_config_dword(dev, 0x54, idemisc | 0x40000000);
> printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n");
> }
> + } else if (trueid == 0x180) { /* sis965L */
> + chipset_family = ATA_133;
> + printk(KERN_INFO "SIS5513: SiS 965 IDE "
> + "UDMA133 controller\n");
> }
> +
> }
>
> if (!chipset_family) { /* Belongs to pci-quirks */
> @@ -955,6 +960,7 @@ static int __devinit sis5513_init_one(st
> static struct pci_device_id sis5513_pci_tbl[] = {
> { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> + { PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 0},
this is one is already claimed by drivers/scsi/sata_sis.c
^ permalink raw reply [flat|nested] only message in thread