From 5b15c33488b020eb3d2cbe36de3ce0f2ea028595 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 30 Aug 2011 20:58:56 -0400
Subject: [PATCH] --- yaml --- r: 263937 b: refs/heads/master c:
 e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 h: refs/heads/master i:   263935:
 2aeffdc455642c4ae8453cc5a6ffa9d7ad678700 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000/e1000_hw.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6026cb0ad5c3..9fa6712d5cfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31a0479546a7f91ec959560be01a0b1243a2b20c
+refs/heads/master: e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
index 8545c7aa93eb..a5a89ecb6f36 100644
--- a/trunk/drivers/net/e1000/e1000_hw.c
+++ b/trunk/drivers/net/e1000/e1000_hw.c
@@ -4026,6 +4026,12 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
 		checksum += eeprom_data;
 	}
 
+#ifdef CONFIG_PARISC
+	/* This is a signature and not a checksum on HP c8000 */
+	if ((hw->subsystem_vendor_id == 0x103C) && (eeprom_data == 0x16d6))
+		return E1000_SUCCESS;
+
+#endif
 	if (checksum == (u16) EEPROM_SUM)
 		return E1000_SUCCESS;
 	else {