diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-18 01:08:39 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-18 01:08:39 -0700 |
| commit | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (patch) | |
| tree | a0c4bbe9983e598ed4c6acab8157dfa30b5204f5 /arch/arm/mach-omap2/Makefile | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| parent | 63b0420c85096d4bb1a3ba365dbf6b970a58b8f7 (diff) | |
Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-voltdomain
OMAP: PM: remove requirement for voltage domain data; remove dummy data
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 55a9d677768..a4f1d2a78d9 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -125,7 +125,6 @@ obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) -obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) # OMAP powerdomain framework |