From bda588f5d001ce137249e6cea148b284a46de81f Mon Sep 17 00:00:00 2001 From: "stigge@antcom.de" Date: Wed, 8 Aug 2012 03:18:54 +0000 Subject: [PATCH] --- yaml --- r: 321578 b: refs/heads/master c: 3a32aea6e01b10a462763e0b0e00805f387ca010 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/nxp/lpc_eth.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 82e99545f6b9..df651f9a1f6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7364e445f62825758fa61195d237a5b8ecdd06ec +refs/heads/master: 3a32aea6e01b10a462763e0b0e00805f387ca010 diff --git a/trunk/drivers/net/ethernet/nxp/lpc_eth.c b/trunk/drivers/net/ethernet/nxp/lpc_eth.c index 4069edab229e..53743f7a2ca9 100644 --- a/trunk/drivers/net/ethernet/nxp/lpc_eth.c +++ b/trunk/drivers/net/ethernet/nxp/lpc_eth.c @@ -346,28 +346,15 @@ static phy_interface_t lpc_phy_interface_mode(struct device *dev) "phy-mode", NULL); if (mode && !strcmp(mode, "mii")) return PHY_INTERFACE_MODE_MII; - return PHY_INTERFACE_MODE_RMII; } - - /* non-DT */ -#ifdef CONFIG_ARCH_LPC32XX_MII_SUPPORT - return PHY_INTERFACE_MODE_MII; -#else return PHY_INTERFACE_MODE_RMII; -#endif } static bool use_iram_for_net(struct device *dev) { if (dev && dev->of_node) return of_property_read_bool(dev->of_node, "use-iram"); - - /* non-DT */ -#ifdef CONFIG_ARCH_LPC32XX_IRAM_FOR_NET - return true; -#else return false; -#endif } /* Receive Status information word */