diff options
| author | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-01-16 11:22:30 +0100 |
| commit | 8d99cd0691b7094ea1e2bf5309b0877047a9f375 (patch) | |
| tree | 464c5cbd4ffe06419bcb03d8c9e9499a77fbd4d4 /include/commproc.h | |
| parent | 9adfc9fb9ade64cdf1ed9ff842e4f900cbda78bd (diff) | |
| parent | 58d204256cb1ce1bd323847d9f644acf70a72e6a (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/commproc.h')
| -rw-r--r-- | include/commproc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/commproc.h b/include/commproc.h index 6b1b4e8fff..32a3e1c82a 100644 --- 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 */ |