diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:40:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:40:33 -0700 |
| commit | 1a8f46100b657f533ce677e79bc27c6794c91c46 (patch) | |
| tree | 65788cbbd19034d01f2708f389131a291b07d58a /drivers/ata/pata_sis.c | |
| parent | b1b8aca480a26efb21168e311e8025a22b042591 (diff) | |
| parent | b54eebd673861136291b97e409a0f248b96e74ae (diff) | |
| download | kernel_samsung_smdk4412-1a8f46100b657f533ce677e79bc27c6794c91c46.tar.gz kernel_samsung_smdk4412-1a8f46100b657f533ce677e79bc27c6794c91c46.tar.bz2 kernel_samsung_smdk4412-1a8f46100b657f533ce677e79bc27c6794c91c46.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: don't check n_sectors during revalidation if zero
pata_via: Add Arima W730-K8 and other rebadgings
pata_sis: Add the FSC Amilo and friends
pata_pdc2027x: PLL detection fixes
libata: fix n_sectors failure handling during revalidation
Diffstat (limited to 'drivers/ata/pata_sis.c')
| -rw-r--r-- | drivers/ata/pata_sis.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 66bd0e83ac0..2bd7645f1a8 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -54,6 +54,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, } }; |