diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 10:41:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 10:41:37 -0400 |
| commit | 0a15e0b5b9342fd7fb3f40b24872c174b0e402ea (patch) | |
| tree | fcaa440936a09a29d8c7c0329a59a1b673dfcc9e /arch/arm/mach-omap2/Makefile | |
| parent | 60d808ddff97071ee4c3e1d13454642f3d0e8ae1 (diff) | |
| parent | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (diff) | |
Merge tag 'omap-for-v3.11/pm-voltdomain-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
PM voltage domain clean-up via Kevin Hilman <khilman@linaro.org>:
OMAP: PM: remove requirement for voltage domain data; remove dummy data
* tag 'omap-for-v3.11/pm-voltdomain-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: AM33xx: Remove the unused voltagedomain data
ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm associated to a pwrdm
Includes an update to Linux 3.10-rc6.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 13302a50cbfc..add1d27a7d94 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -124,7 +124,6 @@ obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o | |||
| 124 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) | 124 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) |
| 125 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o | 125 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o |
| 126 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) | 126 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) |
| 127 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o | ||
| 128 | obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) | 127 | obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) |
| 129 | 128 | ||
| 130 | # OMAP powerdomain framework | 129 | # OMAP powerdomain framework |