From bd186430793f3c6de7401199768228c1679e0dc1 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 28 Jan 2010 16:04:15 +0900
Subject: [PATCH] --- yaml --- r: 180293 b: refs/heads/master c:
 cedc9bf906dae044443d403371c887affdb44168 h: refs/heads/master i:   180291:
 912e60916b44b05546c683aa6e1e197b59f8d181 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/ata/ahci.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 814dcf6c025b..249fd39beca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7acede65d6b65919aee5b6a360a17cedb11f2f7
+refs/heads/master: cedc9bf906dae044443d403371c887affdb44168
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index b8bea100a160..b34390347c16 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -2868,6 +2868,21 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)
 			},
 			.driver_data = "F.23",	/* cutoff BIOS version */
 		},
+		/*
+		 * Acer eMachines G725 has the same problem.  BIOS
+		 * V1.03 is known to be broken.  V3.04 is known to
+		 * work.  Inbetween, there are V1.06, V2.06 and V3.03
+		 * that we don't have much idea about.  For now,
+		 * blacklist anything older than V3.04.
+		 */
+		{
+			.ident = "G725",
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "eMachines"),
+				DMI_MATCH(DMI_PRODUCT_NAME, "eMachines G725"),
+			},
+			.driver_data = "V3.04",	/* cutoff BIOS version */
+		},
 		{ }	/* terminate list */
 	};
 	const struct dmi_system_id *dmi = dmi_first_match(sysids);