diff options
| author | Arnd Bergmann | 2013-06-20 17:35:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2013-06-20 17:35:16 +0200 |
| commit | aee9a50c5b9e424994a58b2aefaa499623e6786a (patch) | |
| tree | bb4b4b1664fa45d4823778efa57bf677b378837c /arch/arm/mach-omap2/voltage.h | |
| parent | Merge tag 'omap-for-v3.11/soc-part2-signed' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-qcow2-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.gz kernel-qcow2-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.xz kernel-qcow2-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.zip | |
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/voltage.h')
| -rw-r--r-- | arch/arm/mach-omap2/voltage.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 5998eed3a2d2..f7f2879b31b0 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -169,7 +169,6 @@ int omap_voltage_late_init(void); extern void omap2xxx_voltagedomains_init(void); extern void omap3xxx_voltagedomains_init(void); -extern void am33xx_voltagedomains_init(void); extern void omap44xx_voltagedomains_init(void); extern void omap54xx_voltagedomains_init(void); |