diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/board-generic.c | |
| parent | 97d9a3d0967f711e271ef950f1745307720c95d5 (diff) | |
| parent | 0f3ccb24c0347cd80160810df79bfa233749074e (diff) | |
| download | linux-24da741c678f865de3182194604dbddcc7fc7f3c.tar.bz2 | |
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index b4fbe50672a3..24c9afc9e8a7 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -169,7 +169,7 @@ static const char *const ti814x_boards_compat[] __initconst = { NULL, }; -DT_MACHINE_START(TI81XX_DT, "Generic ti814x (Flattened Device Tree)") +DT_MACHINE_START(TI814X_DT, "Generic ti814x (Flattened Device Tree)") .reserve = omap_reserve, .map_io = ti81xx_map_io, .init_early = ti814x_init_early, |