diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
| commit | a7c887510073b2f403e123f2befa40bf93554df9 (patch) | |
| tree | afee0628d0688bb2460cfd4eb1ee4cc8281e925c /arch/arm/plat-omap/include/plat/omap24xx.h | |
| parent | 4415beb6fb519c4e98491666838494a8c46cc3ee (diff) | |
| parent | 4367260c0bc1773c00b2309a31b31657cabfda3f (diff) | |
| download | blackbird-obmc-linux-a7c887510073b2f403e123f2befa40bf93554df9.tar.gz blackbird-obmc-linux-a7c887510073b2f403e123f2befa40bf93554df9.zip | |
Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap24xx.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap24xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap24xx.h b/arch/arm/plat-omap/include/plat/omap24xx.h index 7055672a8c68..92df9e27cc5c 100644 --- a/arch/arm/plat-omap/include/plat/omap24xx.h +++ b/arch/arm/plat-omap/include/plat/omap24xx.h @@ -40,7 +40,7 @@ #define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000) #define OMAP24XX_IVA_INTC_BASE 0x40000000 -#define OMAP2420_CTRL_BASE L4_24XX_BASE +#define OMAP242X_CTRL_BASE L4_24XX_BASE #define OMAP2420_32KSYNCT_BASE (L4_24XX_BASE + 0x4000) #define OMAP2420_PRCM_BASE (L4_24XX_BASE + 0x8000) #define OMAP2420_CM_BASE (L4_24XX_BASE + 0x8000) |
