diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-24 00:59:18 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-24 00:59:18 -0400 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/omap_hwmod.h | |
| parent | 97d9a3d0967f711e271ef950f1745307720c95d5 (diff) | |
| parent | 0f3ccb24c0347cd80160810df79bfa233749074e (diff) | |
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/omap_hwmod.h')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h index 13f390202c60..ca6df1a73475 100644 --- a/arch/arm/mach-omap2/omap_hwmod.h +++ b/arch/arm/mach-omap2/omap_hwmod.h | |||
| @@ -759,7 +759,8 @@ extern int omap3xxx_hwmod_init(void); | |||
| 759 | extern int omap44xx_hwmod_init(void); | 759 | extern int omap44xx_hwmod_init(void); |
| 760 | extern int omap54xx_hwmod_init(void); | 760 | extern int omap54xx_hwmod_init(void); |
| 761 | extern int am33xx_hwmod_init(void); | 761 | extern int am33xx_hwmod_init(void); |
| 762 | extern int ti81xx_hwmod_init(void); | 762 | extern int dm814x_hwmod_init(void); |
| 763 | extern int dm816x_hwmod_init(void); | ||
| 763 | extern int dra7xx_hwmod_init(void); | 764 | extern int dra7xx_hwmod_init(void); |
| 764 | int am43xx_hwmod_init(void); | 765 | int am43xx_hwmod_init(void); |
| 765 | 766 | ||