diff options
| author | stigge@antcom.de <stigge@antcom.de> | 2012-08-07 23:18:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-08 19:07:51 -0400 |
| commit | 3a32aea6e01b10a462763e0b0e00805f387ca010 (patch) | |
| tree | c0229def5ef24700524efc976f7586e7d3b9daea | |
| parent | 7364e445f62825758fa61195d237a5b8ecdd06ec (diff) | |
lpc_eth: remove obsolete ifdefs
The #ifdefs regarding CONFIG_ARCH_LPC32XX_MII_SUPPORT and
CONFIG_ARCH_LPC32XX_IRAM_FOR_NET are obsolete since the symbols have been
removed from Kconfig and replaced by devicetree based configuration.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/nxp/lpc_eth.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 4069edab229e..53743f7a2ca9 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c | |||
| @@ -346,28 +346,15 @@ static phy_interface_t lpc_phy_interface_mode(struct device *dev) | |||
| 346 | "phy-mode", NULL); | 346 | "phy-mode", NULL); |
| 347 | if (mode && !strcmp(mode, "mii")) | 347 | if (mode && !strcmp(mode, "mii")) |
| 348 | return PHY_INTERFACE_MODE_MII; | 348 | return PHY_INTERFACE_MODE_MII; |
| 349 | return PHY_INTERFACE_MODE_RMII; | ||
| 350 | } | 349 | } |
| 351 | |||
| 352 | /* non-DT */ | ||
| 353 | #ifdef CONFIG_ARCH_LPC32XX_MII_SUPPORT | ||
| 354 | return PHY_INTERFACE_MODE_MII; | ||
| 355 | #else | ||
| 356 | return PHY_INTERFACE_MODE_RMII; | 350 | return PHY_INTERFACE_MODE_RMII; |
| 357 | #endif | ||
| 358 | } | 351 | } |
| 359 | 352 | ||
| 360 | static bool use_iram_for_net(struct device *dev) | 353 | static bool use_iram_for_net(struct device *dev) |
| 361 | { | 354 | { |
| 362 | if (dev && dev->of_node) | 355 | if (dev && dev->of_node) |
| 363 | return of_property_read_bool(dev->of_node, "use-iram"); | 356 | return of_property_read_bool(dev->of_node, "use-iram"); |
| 364 | |||
| 365 | /* non-DT */ | ||
| 366 | #ifdef CONFIG_ARCH_LPC32XX_IRAM_FOR_NET | ||
| 367 | return true; | ||
| 368 | #else | ||
| 369 | return false; | 357 | return false; |
| 370 | #endif | ||
| 371 | } | 358 | } |
| 372 | 359 | ||
| 373 | /* Receive Status information word */ | 360 | /* Receive Status information word */ |
