diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
| commit | 10e299fc6d596f4e8476d24ebba1495a8355baff (patch) | |
| tree | f7517eccba4dfc223113961c64429f3986afa8eb /drivers | |
| parent | cff93eb3d3244cc117a5204fe1d62102b506afb9 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-proc.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pci/sis5513.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index c12f1b71e93..41b74b13a00 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c @@ -376,6 +376,8 @@ static int proc_ide_read_media break; case ide_floppy:media = "floppy\n"; break; + case ide_optical:media = "optical\n"; + break; default: media = "UNKNOWN\n"; break; } diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 8a6c23ac8cc..f03196c5db3 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -86,6 +86,8 @@ static const struct { u8 chipset_family; u8 flags; } SiSHostChipInfo[] = { + { "SiS968", PCI_DEVICE_ID_SI_968, ATA_133 }, + { "SiS966", PCI_DEVICE_ID_SI_966, ATA_133 }, { "SiS965", PCI_DEVICE_ID_SI_965, ATA_133 }, { "SiS745", PCI_DEVICE_ID_SI_745, ATA_100 }, { "SiS735", PCI_DEVICE_ID_SI_735, ATA_100 }, |