From: Amit Kucheria Date: Wed, 3 Oct 2007 13:54:33 +0000 (+0300) Subject: 3430: Make IO mapping names consistent X-Git-Tag: v2.6.24-omap1~210 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1842a4599d064d25bc04c20db356c3f310f7eba;p=linux-2.6-omap-h63xx.git 3430: Make IO mapping names consistent Signed-off-by: Amit Kucheria Signed-off-by: Tony Lindgren --- diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h index 83b9e662c40..160578e1f55 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/include/asm-arm/arch-omap/io.h @@ -129,7 +129,7 @@ #define L4_PER_34XX_VIRT 0xd9000000 #define L4_PER_34XX_SIZE SZ_1M -#define L4_EMU_34XX_PHYS L4_34XX_EMU_BASE /* 0x54000000 */ +#define L4_EMU_34XX_PHYS L4_EMU_34XX_BASE /* 0x54000000 */ #define L4_EMU_34XX_VIRT 0xe4000000 #define L4_EMU_34XX_SIZE SZ_64M diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h index 792ee0999c5..0265e3be26d 100644 --- a/include/asm-arm/arch-omap/omap34xx.h +++ b/include/asm-arm/arch-omap/omap34xx.h @@ -31,11 +31,11 @@ #define L4_34XX_BASE 0x48000000 #define L4_WK_34XX_BASE 0x48300000 -#define L4_WK_OMAP_BASE L4_WK_OMAP_BASE +#define L4_WK_OMAP_BASE L4_WK_34XX_BASE #define L4_PER_34XX_BASE 0x49000000 #define L4_PER_OMAP_BASE L4_PER_34XX_BASE -#define L4_34XX_EMU_BASE 0x54000000 -#define L4_EMU_BASE L4_34XX_EMU_BASE +#define L4_EMU_34XX_BASE 0x54000000 +#define L4_EMU_BASE L4_EMU_34XX_BASE #define L3_34XX_BASE 0x68000000 #define L3_OMAP_BASE L3_34XX_BASE