diff options
| author | Colin Cross <ccross@android.com> | 2011-08-29 18:35:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-29 18:35:25 -0700 |
| commit | 3417df680f4dd2447579230af64a8cd3899072cc (patch) | |
| tree | 8f8639b3de631c24da7429824f8469e3ff02679a /arch/arm/mach-omap2/Makefile | |
| parent | 0857cd2ce8a9dac03fd4672be7357d8d2d286b6d (diff) | |
| parent | da82940deff70bd2227b0c072e55cac01db2f2b7 (diff) | |
| download | kernel_samsung_tuna-3417df680f4dd2447579230af64a8cd3899072cc.zip kernel_samsung_tuna-3417df680f4dd2447579230af64a8cd3899072cc.tar.gz kernel_samsung_tuna-3417df680f4dd2447579230af64a8cd3899072cc.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 6f7965d..3af3f74 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -99,7 +99,7 @@ obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ cm44xx.o prcm_mpu44xx.o \ prminst44xx.o vc44xx_data.o \ - vp44xx_data.o dvfs.o + vp44xx_data.o dvfs.o omap4-sar.o # OMAP voltage domains ifeq ($(CONFIG_PM),y) |