]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00178631 MX6: fix audmux build error
authorGary Zhang <b13634@freescale.com>
Sun, 1 Apr 2012 05:37:55 +0000 (13:37 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:34:21 +0000 (08:34 +0200)
fix the build error for audmux located at
drivers\mxc\dam

Signed-off-by: Gary Zhang <b13634@freescale.com>
drivers/mxc/dam/dam.c

index 9e57e1a260ea1c535ad786a4c5dae6f6cf88988c..cf8c305cccb6f58555e82edb5d82e6ecfd5963c2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2012 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -34,7 +34,9 @@
 
 #define ModifyRegister32(a, b, c)      (c = (((c)&(~(a))) | (b)))
 
-#define DAM_VIRT_BASE_ADDR     IO_ADDRESS(AUDMUX_BASE_ADDR)
+#if defined(CONFIG_ARCH_MX6)
+#define DAM_VIRT_BASE_ADDR     IO_ADDRESS(MX6Q_AUDMUX_BASE_ADDR)
+#endif
 
 #ifndef _reg_DAM_PTCR1
 #define    _reg_DAM_PTCR1   (*((volatile unsigned long *) \