Merge tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub...

From Tony Lindgren <tony@atomide.com>:

One build fix for recent clean up when CONFIG_PM is not set
and clean up related improvment to the SoC detection.

* tag 'omap-for-v3.8/cleanup-fixes-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: ID: Improve features detection and check
  ARM: OMAP: Fix compile for OMAP_PM_NOOP if PM is not selected

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-omap2/Makefile
index 78cbb8c5992e4f96ee94e84c9960fec37f8fe245,ada6006ab2f31376a7c86b0a70cab0808c208517..dd76ff77760b97082fbaf205657a30493bb099c8
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -73,17 -63,18 +73,18 @@@ obj-$(CONFIG_ARCH_OMAP4)           += opp4xxx_da
  endif
  
  # Power Management
+ obj-$(CONFIG_OMAP_PM_NOOP)            += omap-pm-noop.o
+ 
  ifeq ($(CONFIG_PM),y)
 -obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o sleep24xx.o
 +obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
 +obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
  obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o
 -obj-$(CONFIG_ARCH_OMAP4)              += sleep44xx.o
 -obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o sleep44xx.o
 +obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
- obj-$(CONFIG_OMAP_PM_NOOP)            += omap-pm-noop.o
  
  obj-$(CONFIG_POWER_AVS_OMAP)          += sr_device.o
 -obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)   += smartreflex-class3.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)

diff --cc arch/arm/mach-omap2/id.c
Simple merge