Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / configs / calimain.h

diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index c76bc2cbe6154779c822097377ca3f0a2da23d5b..d20074c7310da6444c2fc39b7f4b1daf1497c66e 100644 (file)
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -185,7 +185,6 @@
 #ifdef CONFIG_DRIVER_TI_EMAC
 #define CONFIG_EMAC_MDIO_PHY_NUM       1
 #define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME