Conflicted merge: master -> DEV_X200_BRINGUP

This commit is contained in:
Ross Owen
2015-04-07 14:52:51 +01:00
14 changed files with 1579 additions and 1579 deletions

View File

@@ -120,7 +120,7 @@ on tile[SPDIF_TX_TILE] : buffered out port:32 p_spdif_tx = PORT_SPDIF_OUT;
#endif
#ifdef ADAT_TX
on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx = PORT_ADAT_OUT;
on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx = PORT_ADAT_OUT;
#endif
#ifdef ADAT_RX