diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 19:06:11 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 19:06:11 -0400 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /arch/arm/mach-omap2/Makefile | |
| parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
| parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b1501bda04b6..cd45c045ab8c 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -116,9 +116,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ | |||
| 116 | obj-$(CONFIG_ARCH_OMAP2) += clockdomain.o \ | 116 | obj-$(CONFIG_ARCH_OMAP2) += clockdomain.o \ |
| 117 | clockdomain2xxx_3xxx.o \ | 117 | clockdomain2xxx_3xxx.o \ |
| 118 | clockdomains2xxx_3xxx_data.o | 118 | clockdomains2xxx_3xxx_data.o |
| 119 | obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o | ||
| 120 | obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o | ||
| 119 | obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \ | 121 | obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \ |
| 120 | clockdomain2xxx_3xxx.o \ | 122 | clockdomain2xxx_3xxx.o \ |
| 121 | clockdomains2xxx_3xxx_data.o | 123 | clockdomains2xxx_3xxx_data.o \ |
| 124 | clockdomains3xxx_data.o | ||
| 122 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain.o \ | 125 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain.o \ |
| 123 | clockdomain44xx.o \ | 126 | clockdomain44xx.o \ |
| 124 | clockdomains44xx_data.o | 127 | clockdomains44xx_data.o |