From: Tony Lindgren <tony@atomide.com>
Date: Tue, 26 Jun 2012 13:55:23 +0000 (-0700)
Subject: Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~135^2~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e74f218abd04dfa082391672295ecc1a3654845;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'for_3.6/pm/sr-move' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-driver
---

9e74f218abd04dfa082391672295ecc1a3654845
diff --cc arch/arm/mach-omap2/Makefile
index fa742f3,f8ee10a..f74e975
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -65,13 -64,14 +65,14 @@@ endi
  ifeq ($(CONFIG_PM),y)
  obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o
 -obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \
 -					   cpuidle34xx.o
 -obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o \
 -					   cpuidle44xx.o
 +obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o
 +obj-$(CONFIG_ARCH_OMAP3)		+= cpuidle34xx.o
 +obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o
 +obj-$(CONFIG_ARCH_OMAP4)		+= cpuidle44xx.o
  obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o
- obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
- obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o
+ 
+ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
+ obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
  
  AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
  AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)