diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-26 09:55:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-26 09:55:23 -0400 |
| commit | 9e74f218abd04dfa082391672295ecc1a3654845 (patch) | |
| tree | d668104b1021bcc737b5fadc7992f45a4c638705 /arch/arm/mach-omap2/Makefile | |
| parent | b955eefc46a6923424cbede2f8ab76c8f5acf056 (diff) | |
| parent | 21ff63ad131218048525fbd37d065ce61f03bcbd (diff) | |
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fa742f3c2629..f74e975027b6 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -70,8 +70,9 @@ obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o | |||
| 70 | obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o | 70 | obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o |
| 71 | obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o | 71 | obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o |
| 72 | obj-$(CONFIG_PM_DEBUG) += pm-debug.o | 72 | obj-$(CONFIG_PM_DEBUG) += pm-debug.o |
| 73 | obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o | 73 | |
| 74 | obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o | 74 | obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o |
| 75 | obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o | ||
| 75 | 76 | ||
| 76 | AFLAGS_sleep24xx.o :=-Wa,-march=armv6 | 77 | AFLAGS_sleep24xx.o :=-Wa,-march=armv6 |
| 77 | AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec) | 78 | AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec) |