From 1b25d1b08491acc52014d4f5cd79f4374b7fda86 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 16 May 2009 19:49:03 +0200
Subject: [PATCH] --- yaml --- r: 146354 b: refs/heads/master c:
 fdac1c76beb9d142675c852834a64a77703bd450 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/icside.c | 2 +-
 trunk/drivers/ide/piix.c   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d6706f981dd..1991112b788d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03682411b1ccd38cbde2e9a6ab43884ff34fbefc
+refs/heads/master: fdac1c76beb9d142675c852834a64a77703bd450
diff --git a/trunk/drivers/ide/icside.c b/trunk/drivers/ide/icside.c
index 4e16ce68b063..36da913cc553 100644
--- a/trunk/drivers/ide/icside.c
+++ b/trunk/drivers/ide/icside.c
@@ -466,7 +466,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 	struct ide_host *host;
 	unsigned int sel = 0;
 	int ret;
-	hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL };
+	hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };
 	struct ide_port_info d = icside_v6_port_info;
 
 	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
diff --git a/trunk/drivers/ide/piix.c b/trunk/drivers/ide/piix.c
index 2aa699933064..69860dea3820 100644
--- a/trunk/drivers/ide/piix.c
+++ b/trunk/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, }
 };