lkml.org 
[lkml]   [2006]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: + sis5513-support-sis-965l.patch added to -mm tree
Date
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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-02-03 17:07    [W:1.235 / U:1.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site