diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-16 17:49:03 (GMT) |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-16 17:49:03 (GMT) |
| commit | fdac1c76beb9d142675c852834a64a77703bd450 (patch) | |
| tree | abb94feb22e481f32ac8f274038df10088fbc6a2 /drivers/ide/piix.c | |
| parent | 03682411b1ccd38cbde2e9a6ab43884ff34fbefc (diff) | |
| parent | d8788298d491ee5026981eb751b0341a996b22e4 (diff) | |
| download | linux-fsl-qoriq-fdac1c76beb9d142675c852834a64a77703bd450.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/ide/piix.c')
| -rw-r--r-- | drivers/ide/piix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index 2aa6999..69860de 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c @@ -263,6 +263,7 @@ static const struct ich_laptop ich_laptop[] = { { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ + { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ /* end marker */ { 0, } }; |