[PATCH 3/3] merge error fixes

[Robin Mueller]

A function was defined twice due to a merge error. 
This patch fixes this.
---
 lwip/ports/drivers/rtems_lwip.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/lwip/ports/drivers/rtems_lwip.c b/lwip/ports/drivers/rtems_lwip.c
index a106616..7e2771c 100644
--- a/lwip/ports/drivers/rtems_lwip.c
+++ b/lwip/ports/drivers/rtems_lwip.c
@@ -196,36 +196,6 @@ rtems_lwip_get_hwaddr_str(struct netif *netif, uint8_t *mac_str)
   mac_str[outindex] = 0;
 }
 
-void
-rtems_lwip_determine_static_ipv4_address(ip4_addr_t* ip_addr, ip4_addr_t* netmask,
-    ip4_addr_t* gw_addr) {
-#if STATIC_IP_ADDRESS == 1
-
-#if CALCULATE_ETH_IP_ADDR == 1
-  IP_ADDR4(ip_addr, IP_ADDR0, IP_ADDR1, IP_ADDR2, IP_ADDR3);
-#else
-  ip_addr->addr = htonl(ETH_IP_ADDR);
-#endif
-
-#if CALCULATE_ETH_NETMASK == 1
-  IP_ADDR4(net_mask, NETMASK_ADDR0, NETMASK_ADDR1, NETMASK_ADDR2, NETMASK_ADDR3);
-#else
-  net_mask->addr = htonl(ETH_NETMASK);
-#endif
-
-#if CALCULATE_GW_ADDRESS == 1
-  IP_ADDR4(gw_addr, GW_ADDR0, GW_ADDR1, GW_ADDR2, GW_ADDR3);
-#else
-  gw_addr->addr = htonl(ETH_GW);
-#endif
-
-#else
-  ip_addr_set_zero_ip4(ip_addr);
-  ip_addr_set_zero_ip4(netmask);
-  ip_addr_set_zero_ip4(gw_addr);
-#endif /* STATIC_IP_ADDRESS == 0 */
-}
-
 void
 rtems_lwip_convert_ip_to_decimal_str(ip_addr_t ip, uint8_t *ip_str)
 {
-- 
2.25.1