diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:00:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:00:27 +0200 |
| commit | 5f1e3c910013254221ad4bcf8d6bfcb84a1a05e5 (patch) | |
| tree | bc54a196aaa4939c76ac843c15f248cecdab827d /arch/arm/mach-omap2/pm44xx.c | |
| parent | Merge tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu into n... (diff) | |
| parent | ARM: OMAP3: clock: remove un-used core dpll re-program code (diff) | |
| download | linux-5f1e3c910013254221ad4bcf8d6bfcb84a1a05e5.tar.xz linux-5f1e3c910013254221ad4bcf8d6bfcb84a1a05e5.zip | |
Merge tag 'omap-for-v4.4/cleanup-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Merge "Clean-up for omaps for v4.4 merge window" from Tony Lindgren:
- Remove legacy omap3 ISP code as the driver is DT only
- Remove VoiceBlue board support as it's been unused over
10 years now
- Remove unused polarity control macros for TWL
- Remove two unneeded semicolons
- Remove unused core dpll code for reprogramming the rates
Note that this branch is against v4.3-rc4 as that contains critical
MMC related fixes to boot with MMC working on most omaps.
* tag 'omap-for-v4.4/cleanup-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3: clock: remove un-used core dpll re-program code
ARM: OMAP2+: Remove unneeded semicolons
ARM: OMAP3: vc: Remove unused macros
ARM: OMAP1: Remove board support for VoiceBlue board
ARM: OMAP2+: Remove legacy OMAP3 ISP instantiation
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index d697cecf762b..178e22c146b7 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -210,7 +210,7 @@ static inline int omap4plus_init_static_deps(const struct static_dep_map *map) } map++; - }; + } return 0; } |