Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / include / asm / cpm2.h

diff --git a/arch/powerpc/include/asm/cpm2.h b/arch/powerpc/include/asm/cpm2.h
index f42e9baf3a4e743fddd9cf4bbc809f49aa1299d0..7c8608b096947000f7120f2a7ee729677962a094 100644 (file)
--- a/arch/powerpc/include/asm/cpm2.h
+++ b/arch/powerpc/include/asm/cpm2.h
@@ -489,7 +489,6 @@ typedef struct scc_trans {
 #define FCC_GFMR_TCI           ((uint)0x20000000)
 #define FCC_GFMR_TRX           ((uint)0x10000000)
 #define FCC_GFMR_TTX           ((uint)0x08000000)
-#define FCC_GFMR_TTX           ((uint)0x08000000)
 #define FCC_GFMR_CDP           ((uint)0x04000000)
 #define FCC_GFMR_CTSP          ((uint)0x02000000)
 #define FCC_GFMR_CDS           ((uint)0x01000000)