diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-17 18:13:18 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-17 18:13:18 +0200 |
commit | e1342f1da06d39b3bbd530e9306347c4438bc6e5 (patch) | |
tree | 3d8d70c1e633d9bd5b929ad27b8123faa7789b84 /drivers/ide/piix.c | |
parent | [ARM] 5513/1: Eurotech VIPER SBC: fix compilation error (diff) | |
parent | [ARM] realview: fix broadcast tick support (diff) | |
download | linux-e1342f1da06d39b3bbd530e9306347c4438bc6e5.tar.xz linux-e1342f1da06d39b3bbd530e9306347c4438bc6e5.zip |
Merge branch 'smp-fix'
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 2aa699933064..69860dea3820 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, } }; |