commit cf8e09b06d7ac05de4b6a3f1ee563979e36a46ed
author Florian Fainelli <ffainelli@freebox.fr> Mon Jan 24 14:48:03 2011 +0000
committer Jeff Kirsher <jeffrey.t.kirsher@intel.com> Tue Feb 08 01:17:30 2011 -0800
tree a418b0d314ee07e0e88f218efcae537d6ed5d6a3
parent 463342741222c79469303cdab8ce99c8bc2d80e8

e1000: add support for Marvell Alaska M88E1118R PHY

This patch adds support for Marvell Alask M88E188R PHY chips. Support for
other M88* PHYs is already there, so there is nothing more to add than its
PHY id.

CC: Dirk Brandewie <dirk.j.brandewie@intel.com>
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/e1000/e1000_hw.h

diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 196eeda..c70b23d 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -2917,6 +2917,7 @@
 #define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
 #define M88E1011_I_REV_4   0x04
 #define M88E1111_I_PHY_ID  0x01410CC0
+#define M88E1118_E_PHY_ID  0x01410E40
 #define L1LXT971A_PHY_ID   0x001378E0
 
 #define RTL8211B_PHY_ID    0x001CC910