Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[pandora-kernel.git] / arch / arm / plat-mxc / include / mach / board-kzmarm11.h

diff --git a/arch/arm/plat-mxc/include/mach/board-kzmarm11.h b/arch/arm/plat-mxc/include/mach/board-kzmarm11.h
index 05ff2f3..93cc66f 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/board-kzmarm11.h
+++ b/arch/arm/plat-mxc/include/mach/board-kzmarm11.h
@@ -21,19 +21,19 @@
 /*
  *  KZM-ARM11-01 Board Control Registers on FPGA
  */
-#define KZM_ARM11_CTL1         (CS4_BASE_ADDR + 0x1000)
-#define KZM_ARM11_CTL2         (CS4_BASE_ADDR + 0x1001)
-#define KZM_ARM11_RSW1         (CS4_BASE_ADDR + 0x1002)
-#define KZM_ARM11_BACK_LIGHT   (CS4_BASE_ADDR + 0x1004)
-#define KZM_ARM11_FPGA_REV     (CS4_BASE_ADDR + 0x1008)
-#define KZM_ARM11_7SEG_LED     (CS4_BASE_ADDR + 0x1010)
-#define KZM_ARM11_LEDS         (CS4_BASE_ADDR + 0x1020)
-#define KZM_ARM11_DIPSW2       (CS4_BASE_ADDR + 0x1003)
+#define KZM_ARM11_CTL1         (MX31_CS4_BASE_ADDR + 0x1000)
+#define KZM_ARM11_CTL2         (MX31_CS4_BASE_ADDR + 0x1001)
+#define KZM_ARM11_RSW1         (MX31_CS4_BASE_ADDR + 0x1002)
+#define KZM_ARM11_BACK_LIGHT   (MX31_CS4_BASE_ADDR + 0x1004)
+#define KZM_ARM11_FPGA_REV     (MX31_CS4_BASE_ADDR + 0x1008)
+#define KZM_ARM11_7SEG_LED     (MX31_CS4_BASE_ADDR + 0x1010)
+#define KZM_ARM11_LEDS         (MX31_CS4_BASE_ADDR + 0x1020)
+#define KZM_ARM11_DIPSW2       (MX31_CS4_BASE_ADDR + 0x1003)
 
 /*
  * External UART for touch panel on FPGA
  */
-#define KZM_ARM11_16550                (CS4_BASE_ADDR + 0x1050)
+#define KZM_ARM11_16550                (MX31_CS4_BASE_ADDR + 0x1050)
 
 #endif /* __ARM_ARCH_BOARD_KZM_ARM11_H */