diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 12:47:01 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 12:47:01 (GMT) |
| commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (patch) | |
| tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 /arch/arm/mach-omap2/Makefile | |
| parent | 5f6129675bf17aeda5385830c446b91899cb6812 (diff) | |
| parent | 19f3a98d82cabdff5a1a437811d472ef52f34954 (diff) | |
| download | linux-fsl-qoriq-472fd5401561f94698f4c8f9dbbbfbf76ab55626.tar.xz | |
Merge branch 'cleanup-hwmod' into cleanup
Conflicts:
arch/arm/mach-omap2/dsp.c
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 664224f..9ba1c40 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -116,7 +116,6 @@ obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o # PRCM clockdomain control clockdomain-common += clockdomain.o -clockdomain-common += clockdomains_common_data.o obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common) obj-$(CONFIG_ARCH_OMAP2) += clockdomain2xxx_3xxx.o obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o |