diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-07-05 11:18:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-05 11:18:04 -0400 |
| commit | 79ab2664336d73245023a236345bb31f2b0a2dfe (patch) | |
| tree | 16fb7f77074a39b74aecbf324b0b7de2eaf6d094 /arch/arm/mach-omap2/Makefile | |
| parent | ecc46cfdad7499a21296f0757059c4965f1fbc98 (diff) | |
| parent | e30384abd63dfa11508a38243e1d78f1d70486b1 (diff) | |
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data
OMAP AM33xx clock data
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 240f1969f2ad..3e7d54af4c91 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -157,6 +157,7 @@ obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o | |||
| 157 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o | 157 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o |
| 158 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o | 158 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o |
| 159 | obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o | 159 | obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o |
| 160 | obj-$(CONFIG_SOC_AM33XX) += clock33xx_data.o | ||
| 160 | 161 | ||
| 161 | # OMAP2 clock rate set data (old "OPP" data) | 162 | # OMAP2 clock rate set data (old "OPP" data) |
| 162 | obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o | 163 | obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o |