diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:44:54 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:44:54 -0400 |
| commit | 970a724d9173526512ebd8be991a4cbe18b7aace (patch) | |
| tree | 7541c2b34e82ccabb068bdae530936838a71fad8 /arch/arm/plat-omap/include/mach/omap34xx.h | |
| parent | c81592ba1b012d555d0cb7ec711afda89c327469 (diff) | |
| parent | 4a899d5e93fd974952492cd4a09e98b209d1ad58 (diff) | |
Merge branch 'omap3-upstream' into for-next
Conflicts:
arch/arm/mach-omap2/serial.c
Diffstat (limited to 'arch/arm/plat-omap/include/mach/omap34xx.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/omap34xx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index cc2573330dc8..f8d186a73712 100644 --- a/arch/arm/plat-omap/include/mach/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h | |||
| @@ -31,13 +31,9 @@ | |||
| 31 | 31 | ||
| 32 | #define L4_34XX_BASE 0x48000000 | 32 | #define L4_34XX_BASE 0x48000000 |
| 33 | #define L4_WK_34XX_BASE 0x48300000 | 33 | #define L4_WK_34XX_BASE 0x48300000 |
| 34 | #define L4_WK_OMAP_BASE L4_WK_34XX_BASE | ||
| 35 | #define L4_PER_34XX_BASE 0x49000000 | 34 | #define L4_PER_34XX_BASE 0x49000000 |
| 36 | #define L4_PER_OMAP_BASE L4_PER_34XX_BASE | ||
| 37 | #define L4_EMU_34XX_BASE 0x54000000 | 35 | #define L4_EMU_34XX_BASE 0x54000000 |
| 38 | #define L4_EMU_BASE L4_EMU_34XX_BASE | ||
| 39 | #define L3_34XX_BASE 0x68000000 | 36 | #define L3_34XX_BASE 0x68000000 |
| 40 | #define L3_OMAP_BASE L3_34XX_BASE | ||
| 41 | 37 | ||
| 42 | #define OMAP3430_32KSYNCT_BASE 0x48320000 | 38 | #define OMAP3430_32KSYNCT_BASE 0x48320000 |
| 43 | #define OMAP3430_CM_BASE 0x48004800 | 39 | #define OMAP3430_CM_BASE 0x48004800 |