From e629950c269594865de243200d3af806b9c23d76 Mon Sep 17 00:00:00 2001
From: Mikko Rapeli <mikko.rapeli@teleca.com>
Date: Tue, 19 Feb 2008 01:41:25 +0100
Subject: [PATCH] --- yaml --- r: 85780 b: refs/heads/master c:
 b152fcd34108d07a1e682786af583fd3e080cab3 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 1 +
 trunk/drivers/ide/ide-disk.c    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe90d3ecb589..cf7049f278af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 899e1bc57340ad9acf5561b1eff7a684975ad800
+refs/heads/master: b152fcd34108d07a1e682786af583fd3e080cab3
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index beaa3a9d8b6d..f46eb6f6dc9f 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -4190,6 +4190,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 	/* Devices which report 1 sector over size HPA */
 	{ "ST340823A",		NULL,		ATA_HORKAGE_HPA_SIZE, },
 	{ "ST320413A",		NULL,		ATA_HORKAGE_HPA_SIZE, },
+	{ "ST310211A",		NULL,		ATA_HORKAGE_HPA_SIZE, },
 
 	/* Devices which get the IVB wrong */
 	{ "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB, },
diff --git a/trunk/drivers/ide/ide-disk.c b/trunk/drivers/ide/ide-disk.c
index aed8b31ca561..8f5bed471050 100644
--- a/trunk/drivers/ide/ide-disk.c
+++ b/trunk/drivers/ide/ide-disk.c
@@ -397,6 +397,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id)
 static const struct drive_list_entry hpa_list[] = {
 	{ "ST340823A",	NULL },
 	{ "ST320413A",	NULL },
+	{ "ST310211A",	NULL },
 	{ NULL,		NULL }
 };