Merge branch 'pm-runtime' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...

diff --combined arch/arm/mach-omap2/Makefile
index 826cb0980054f154b5803b79d058a34b85b0a599,b48ca6039d83d1ad63c3669819e5dd7c12fc73a0..e599ae2a5de42ff44a374bb6ecf5fe76473d327d
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -5,7 -5,7 +5,7 @@@
  # Common support
  obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o
  
 -omap-2-3-common                               = irq.o sdrc.o
 +omap-2-3-common                               = irq.o sdrc.o prm2xxx_3xxx.o
  hwmod-common                          = omap_hwmod.o \
                                          omap_hwmod_common_data.o
  prcm-common                           = prcm.o powerdomain.o
@@@ -15,7 -15,7 +15,7 @@@ clock-common                          = clock.o clock_common_
  
  obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
  obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
 -obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) $(hwmod-common)
 +obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)
  
  obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
  
@@@ -49,14 -49,18 +49,18 @@@ obj-$(CONFIG_ARCH_OMAP2)           += sdrc2xxx.
  # Power Management
  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
+ obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o pm_bus.o
+ obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o cpuidle34xx.o pm_bus.o
+ obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o pm_bus.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
  
  AFLAGS_sleep24xx.o                    :=-Wa,-march=armv6
  AFLAGS_sleep34xx.o                    :=-Wa,-march=armv7-a
  
+ ifeq ($(CONFIG_PM_VERBOSE),y)
+ CFLAGS_pm_bus.o                               += -DDEBUG
+ endif
+ 
  endif
  
  # PRCM
@@@ -87,7 -91,6 +91,7 @@@ obj-$(CONFIG_ARCH_OMAP2430)           += opp2430
  obj-$(CONFIG_ARCH_OMAP2420)           += omap_hwmod_2420_data.o
  obj-$(CONFIG_ARCH_OMAP2430)           += omap_hwmod_2430_data.o
  obj-$(CONFIG_ARCH_OMAP3)              += omap_hwmod_3xxx_data.o
 +obj-$(CONFIG_ARCH_OMAP4)              += omap_hwmod_44xx_data.o
  
  # EMU peripherals
  obj-$(CONFIG_OMAP3_EMU)                       += emu.o