Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / include / commproc.h

diff --git a/include/commproc.h b/include/commproc.h
index 6b1b4e8..32a3e1c 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -1448,7 +1448,9 @@ typedef struct scc_enet {
  */
 #define        PROFF_ENET      PROFF_SCC2
 #define        CPM_CR_ENET     CPM_CR_CH_SCC2
+#if (!defined(CONFIG_TK885D))  /* TK885D does not use SCC Ethernet */
 #define        SCC_ENET        1
+#endif
 #define PA_ENET_RXD    ((ushort)0x0004)        /* PA 13 */
 #define PA_ENET_TXD    ((ushort)0x0008)        /* PA 12 */
 #define PA_ENET_RCLK   ((ushort)0x0100)        /* PA  7 */