diff options
| author | Tony Lindgren | 2011-12-16 23:00:23 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2011-12-16 23:00:23 +0100 |
| commit | 9d297f5ee1b92a84e2cd6c547c3ac1f893128359 (patch) | |
| tree | cff90b5421967f17d11a7611a9c5f0fca0be4d67 /arch/arm/mach-omap2/Makefile | |
| parent | ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init (diff) | |
| parent | ARM: OMAP4: PRM: use PRCM interrupt handler (diff) | |
| download | kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.tar.gz kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.tar.xz kernel-qcow2-linux-9d297f5ee1b92a84e2cd6c547c3ac1f893128359.zip | |
Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 9a6da52661ce..63a5efad70e8 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -81,6 +81,7 @@ endif endif # PRCM +obj-y += prm_common.o obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \ vc3xxx_data.o vp3xxx_data.o @@ -90,7 +91,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 + vp44xx_data.o prm44xx.o # OMAP voltage domains voltagedomain-common := voltage.o vc.o vp.o |