Merge branch 'omap-for-v4.10/legacy' into omap-for-v4.10/fixes

diff --combined arch/arm/mach-omap2/Makefile
index 469894082fea00c9605ea4dc370d69b18f5b40d3,1ff04f1a6d965781deb4585f8d07316bb2e3cd60..093458b62c8dadbcc3c7cc1c3b66d84e59af3d8d
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -7,7 -7,7 +7,7 @@@ ccflags-y := -I$(srctree)/$(src)/includ
  
  # Common support
  obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \
-        common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
+        common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
         omap_device.o omap-headsmp.o sram.o drm.o
  
  hwmod-common                          = omap_hwmod.o omap_hwmod_reset.o \
@@@ -77,7 -77,7 +77,7 @@@ endi
  # Power Management
  omap-4-5-pm-common                    = omap-mpuss-lowpower.o
  obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-pm-common)
 -obj-$(CONFIG_ARCH_OMAP5)              += $(omap-4-5-pm-common)
 +obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-pm-common)
  obj-$(CONFIG_OMAP_PM_NOOP)            += omap-pm-noop.o
  
  ifeq ($(CONFIG_PM),y)