summaryrefslogtreecommitdiff
path: root/include/configs/CPCI2DP.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-01 16:47:23 -0400
committerTom Rini <trini@konsulko.com>2015-06-02 08:53:41 -0400
commit563e53efaadd76def21612bcf9f0236d870b6e68 (patch)
tree0d66d466f2c9a4cd1f6356fe889a60429745ec13 /include/configs/CPCI2DP.h
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
Merge branch 'master' of git://git.denx.de/u-boot-net
Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/CPCI2DP.h')
-rw-r--r--include/configs/CPCI2DP.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 845ed81a46..3ccb9a725c 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -62,7 +62,6 @@
#define CONFIG_CMD_BSP
#define CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
#undef CONFIG_WATCHDOG /* watchdog disabled */