diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:35:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:35:16 +0200 |
| commit | aee9a50c5b9e424994a58b2aefaa499623e6786a (patch) | |
| tree | bb4b4b1664fa45d4823778efa57bf677b378837c /arch/arm/mach-omap2/Makefile | |
| parent | 58eb042889ddc8035ddb68a9c9cbd2251d1b7feb (diff) | |
| parent | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (diff) | |
| download | blackbird-op-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.gz blackbird-op-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/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 f8bc62fd48fb..ec2e128074d8 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -130,7 +130,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_AM43XX) += $(voltagedomain-common) obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) obj-$(CONFIG_SOC_OMAP5) += voltagedomains54xx_data.o |
