diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-15 21:11:47 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-15 21:11:47 -0800 |
| commit | c97136307c2cd336a3ee68cc0890b0f55d01d2d4 (patch) | |
| tree | da721e041c495451b55ffec95fc1d7d63f4df9cd /arch/arm/plat-omap/include/plat/uncompress.h | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff) | |
| parent | 4390f5b2cb1f568c1d4b3e5bbf57158f6809627a (diff) | |
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/soc
Diffstat (limited to 'arch/arm/plat-omap/include/plat/uncompress.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/uncompress.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index 2f472e989ec6..7fbc361946b5 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h @@ -99,9 +99,9 @@ static inline void flush(void) #define DEBUG_LL_ZOOM(mach) \ _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART) -#define DEBUG_LL_TI816X(p, mach) \ - _DEBUG_LL_ENTRY(mach, TI816X_UART##p##_BASE, OMAP_PORT_SHIFT, \ - TI816XUART##p) +#define DEBUG_LL_TI81XX(p, mach) \ + _DEBUG_LL_ENTRY(mach, TI81XX_UART##p##_BASE, OMAP_PORT_SHIFT, \ + TI81XXUART##p) static inline void __arch_decomp_setup(unsigned long arch_id) { @@ -177,7 +177,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id) DEBUG_LL_ZOOM(omap_zoom3); /* TI8168 base boards using UART3 */ - DEBUG_LL_TI816X(3, ti8168evm); + DEBUG_LL_TI81XX(3, ti8168evm); } while (0); } |