Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC fixes from Olof Johansson:
 "This is our first set of fixes from arm-soc for 3.11.
   - A handful of build and warning fixes from Arnd
   - A collection of OMAP fixes
   - defconfig updates to make the default configs more useful for real
     use (and testing) out of the box on hardware

  And a couple of other small fixes.  Some of these have been recently
  applied but it's normally how we deal with fixes, with less bake time
  in -next needed"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
  arm: multi_v7_defconfig: Tweaks for omap and sunxi
  arm: multi_v7_defconfig: add i.MX options and NFS root
  ARM: omap2: add select of TI_PRIV_EDMA
  ARM: exynos: select PM_GENERIC_DOMAINS only when used
  ARM: ixp4xx: avoid circular header dependency
  ARM: OMAP: omap_common_late_init may be unused
  ARM: sti: move DEBUG_STI_UART into alphabetical order
  ARM: OMAP: build mach-omap code only if needed
  ARM: zynq: use DT_MACHINE_START
  ARM: omap5: omap5 has SCU and TWD
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ...

diff --combined arch/arm/configs/omap2plus_defconfig
index a24c024,0870b5c..5339e6a
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -22,6 -22,10 +22,10 @@@ CONFIG_MODULE_SRCVERSION_ALL=
  # CONFIG_BLK_DEV_BSG is not set
  CONFIG_ARCH_MULTI_V6=y
  CONFIG_ARCH_OMAP2PLUS=y
+ CONFIG_ARCH_OMAP2=y
+ CONFIG_ARCH_OMAP3=y
+ CONFIG_ARCH_OMAP4=y
+ CONFIG_SOC_AM33XX=y
  CONFIG_OMAP_RESET_CLOCKS=y
  CONFIG_OMAP_MUX_DEBUG=y
  CONFIG_ARCH_VEXPRESS_CA9X4=y
@@@ -34,6 -38,8 +38,8 @@@ CONFIG_NR_CPUS=
  CONFIG_LEDS=y
  CONFIG_ZBOOT_ROM_TEXT=0x0
  CONFIG_ZBOOT_ROM_BSS=0x0
+ CONFIG_ARM_APPENDED_DTB=y
+ CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
  CONFIG_KEXEC=y
  CONFIG_FPE_NWFPE=y
@@@ -152,6 -158,13 +158,13 @@@ CONFIG_W1=
  CONFIG_POWER_SUPPLY=y
  CONFIG_SENSORS_LM75=m
  CONFIG_WATCHDOG=y
+ CONFIG_THERMAL=y
+ CONFIG_THERMAL_HWMON=y
+ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+ CONFIG_THERMAL_GOV_FAIR_SHARE=y
+ CONFIG_THERMAL_GOV_STEP_WISE=y
+ CONFIG_THERMAL_GOV_USER_SPACE=y
+ CONFIG_CPU_THERMAL=y
  CONFIG_OMAP_WATCHDOG=y
  CONFIG_TWL4030_WATCHDOG=y
  CONFIG_MFD_TPS65217=y
@@@ -238,7 -251,13 +251,13 @@@ CONFIG_RTC_DRV_TWL92330=
  CONFIG_RTC_DRV_TWL4030=y
  CONFIG_RTC_DRV_OMAP=y
  CONFIG_DMADEVICES=y
+ CONFIG_TI_EDMA=y
  CONFIG_DMA_OMAP=y
+ CONFIG_TI_SOC_THERMAL=y
+ CONFIG_TI_THERMAL=y
+ CONFIG_OMAP4_THERMAL=y
+ CONFIG_OMAP5_THERMAL=y
+ CONFIG_DRA752_THERMAL=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
@@@ -286,4 -305,3 +305,4 @@@ CONFIG_SOC_OMAP5=
  CONFIG_TI_DAVINCI_MDIO=y
  CONFIG_TI_DAVINCI_CPDMA=y
  CONFIG_TI_CPSW=y
 +CONFIG_AT803X_PHY=y

diff --combined arch/arm/mach-omap2/timer.c
index 29ac667,5f148e7..b37e1fc
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -41,10 -41,10 +41,10 @@@
  #include <linux/of_irq.h>
  #include <linux/platform_device.h>
  #include <linux/platform_data/dmtimer-omap.h>
 +#include <linux/sched_clock.h>
  
  #include <asm/mach/time.h>
  #include <asm/smp_twd.h>
 -#include <asm/sched_clock.h>
  
  #include "omap_hwmod.h"
  #include "omap_device.h"
@@@ -220,7 -220,7 +220,7 @@@ static int __init omap_dm_timer_init_on
                                         int posted)
  {
        char name[10]; /* 10 = sizeof("gptXX_Xck0") */
-       const char *oh_name;
+       const char *oh_name = NULL;
        struct device_node *np;
        struct omap_hwmod *oh;
        struct resource irq, mem;