mirror of
https://github.com/torvalds/linux
synced 2024-09-27 23:10:58 +00:00
2cbe23e3a4
Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
8 lines
222 B
C
8 lines
222 B
C
/* 2MB large area for motherboard's peripherals static mapping */
|
|
#define V2M_PERIPH 0xf8000000
|
|
|
|
/* Tile's peripherals static mappings should start here */
|
|
#define V2T_PERIPH 0xf8200000
|
|
|
|
void vexpress_dt_smp_map_io(void);
|