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

@@ -42,7 +42,6 @@
/* use REF for ADAT_RX on U-series */
/* #define CLKBLK_ADAT_RX XS1_CLKBLK_3 */
/* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */
#define CLKBLK_I2S_BIT XS1_CLKBLK_3
#endif