diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 20:48:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 20:48:42 -0700 |
| commit | 878701db07db3f0b59f14f0c525b681e4ca81551 (patch) | |
| tree | 132083fef920c0df6e41379909d3f071f2d68032 /drivers/ide/pci/sis5513.c | |
| parent | 04668873daa822aa6c806ba28d1143db8dcb26e8 (diff) | |
| parent | 3fcece66911c9d485c1e2050ba033fde607b5130 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
scc_pata: PIO fixes
piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2)
jmicron: PIO fixes
it8213: PIO fixes (take 2)
cs5535: PIO fixes
cs5520: fix PIO auto-tuning in ->ide_dma_check method
drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc
drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc
ide: eliminate warnings in ide-tape.c
ide: fix runtogether printk's in cmd64x IDE driver
sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops
alim15x3: Correct HP detect
ide: Fix an overrun found in the CS5535 IDE driver
Diffstat (limited to 'drivers/ide/pci/sis5513.c')
| -rw-r--r-- | drivers/ide/pci/sis5513.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 63fbb79e817..26f24802d3e 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -801,6 +801,7 @@ struct sis_laptop { static const struct sis_laptop sis_laptop[] = { /* devid, subvendor, subdev */ { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ + { 0x5513, 0x1734, 0x105f }, /* FSC Amilo A1630 */ /* end marker */ { 0, } }; |