diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-28 14:53:59 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-28 14:53:59 -0700 |
| commit | dc9ca24f4d7a5ff33d7e12ca809564d37188212b (patch) | |
| tree | 2e2ca8af0714c5bd64aa37cc9433dcce653b1ad4 /arch/arm/plat-omap | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
| parent | cefcadeaa7d5681b88b3ee2272d961c23a70a091 (diff) | |
| download | blackbird-obmc-linux-dc9ca24f4d7a5ff33d7e12ca809564d37188212b.tar.gz blackbird-obmc-linux-dc9ca24f4d7a5ff33d7e12ca809564d37188212b.zip | |
Merge branch 'for_3_2/omap_misc' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into l3
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index d72ec85c97e6..fb5fd246897b 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -228,13 +228,13 @@ #define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE /* 0x4d000000 --> 0xfd200000 */ -#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET) #define OMAP44XX_EMIF2_SIZE SZ_1M +#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE) #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE /* 0x4e000000 --> 0xfd300000 */ -#define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET) #define OMAP44XX_DMM_SIZE SZ_1M +#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE) /* * ---------------------------------------------------------------------------- * Omap specific register access |
