Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Omap fixes and minor defconfig updates that would be good to
get in before -rc1.

* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  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
  ARM: scu: provide inline dummy functions when SCU is not present
  ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
  ARM: OMAP2+: timer: initialize before using oh_name

Signed-off-by: Olof Johansson <olof@lixom.net>

Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.

1 files changed, 0 insertions, 10 deletions

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index c019b7aaf776..c66d163d7a2a 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -666,14 +666,9 @@ void __init orion_xor0_init(unsigned long mapbase_low,
         orion_xor0_shared_resources[3].start = irq_1;
         orion_xor0_shared_resources[3].end = irq_1;
 
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
         dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[0].cap_mask);
         dma_cap_set(DMA_XOR, orion_xor0_channels_data[0].cap_mask);
 
-        dma_cap_set(DMA_MEMSET, orion_xor0_channels_data[1].cap_mask);
         dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[1].cap_mask);
         dma_cap_set(DMA_XOR, orion_xor0_channels_data[1].cap_mask);
 
@@ -732,14 +727,9 @@ void __init orion_xor1_init(unsigned long mapbase_low,
         orion_xor1_shared_resources[3].start = irq_1;
         orion_xor1_shared_resources[3].end = irq_1;
 
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
         dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[0].cap_mask);
         dma_cap_set(DMA_XOR, orion_xor1_channels_data[0].cap_mask);
 
-        dma_cap_set(DMA_MEMSET, orion_xor1_channels_data[1].cap_mask);
         dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[1].cap_mask);
         dma_cap_set(DMA_XOR, orion_xor1_channels_data[1].cap_mask);