From 284781e485a2126bb9ce29b7828080118612d5b6 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Tue, 3 Jul 2007 16:24:32 -0500 Subject: [PATCH] --- yaml --- r: 58744 b: refs/heads/master c: 85cfb534280dd6a7c7ac399bb2888e1b8b286ece h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/marvell.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bb53747e5d3b..92ba8e6b40db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e54792396fb658b97e2f7b0541c6334020e1a3ec +refs/heads/master: 85cfb534280dd6a7c7ac399bb2888e1b8b286ece diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c index 21cb3aa4ae7e..d2ede5ff9fff 100644 --- a/trunk/drivers/net/phy/marvell.c +++ b/trunk/drivers/net/phy/marvell.c @@ -267,6 +267,19 @@ static struct phy_driver marvell_drivers[] = { .config_intr = &marvell_config_intr, .driver = {.owner = THIS_MODULE,}, }, + { + .phy_id = 0x01410c90, + .phy_id_mask = 0xfffffff0, + .name = "Marvell 88E1112", + .features = PHY_GBIT_FEATURES, + .flags = PHY_HAS_INTERRUPT, + .config_init = &m88e1111_config_init, + .config_aneg = &marvell_config_aneg, + .read_status = &genphy_read_status, + .ack_interrupt = &marvell_ack_interrupt, + .config_intr = &marvell_config_intr, + .driver = {.owner = THIS_MODULE,}, + }, { .phy_id = 0x01410cc0, .phy_id_mask = 0xfffffff0,