summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-30 14:45:31 +0100
committerArnd Bergmann <arnd@arndb.de>2016-11-30 14:45:31 +0100
commite264ae280ce178c2da6ddf77c9a7928c6d3b6caa (patch)
treee11c0d154382a429b819346e20302116258c8331 /arch/arm/mach-davinci/include
parentMerge tag 'mvebu-soc-4.10-1' of git://git.infradead.org/linux-mvebu into next... (diff)
parentARM: davinci: PM: fix build when da850 not compiled in (diff)
downloadlinux-e264ae280ce178c2da6ddf77c9a7928c6d3b6caa.tar.xz
linux-e264ae280ce178c2da6ddf77c9a7928c6d3b6caa.zip
Merge tag 'davinci-for-v4.10/cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull DaVinci cleanup for v4.10 from Sekhar Nori: mach-davinci cleanup to make it easy to add PM support for DT-boot. * tag 'davinci-for-v4.10/cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: PM: fix build when da850 not compiled in ARM: davinci: PM: cleanup: remove references to pdata ARM: davinci: PM: rework init, remove platform device
Diffstat (limited to 'arch/arm/mach-davinci/include')
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 43322be26bd5..85ff2183b6db 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -106,7 +106,6 @@ int da8xx_register_gpio(void *pdata);
int da850_register_cpufreq(char *async_clk);
int da8xx_register_cpuidle(void);
void __iomem *da8xx_get_mem_ctlr(void);
-int da850_register_pm(struct platform_device *pdev);
int da850_register_sata(unsigned long refclkpn);
int da850_register_vpif(void);
int da850_register_vpif_display