Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83b5938c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2 

* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
  ARM: pxa: use common IOMEM definition
  ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
parents fdd83974 23019a73

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ config ZONE_DMA 
config NEED_DMA_MAP_STATE

       def_bool y



config ARCH_HAS_DMA_SET_COHERENT_MASK

	bool



config GENERIC_ISA_DMA

	bool
@@ -547,6 +550,7 @@ config ARCH_IXP2000 
config ARCH_IXP4XX

	bool "IXP4xx-based"

	depends on MMU

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select CLKSRC_MMIO

	select CPU_XSCALE

	select GENERIC_GPIO

arch/arm/mach-ixp4xx/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define PCIBIOS_MAX_MEM		0x4BFFFFFF

#endif



#define ARCH_HAS_DMA_SET_COHERENT_MASK



/* Register locations and bits */

#include "ixp4xx-regs.h"

arch/arm/mach-pxa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ config CSB726_CSB701 


config MACH_ARMCORE

	bool "CompuLab CM-X255/CM-X270 modules"

	select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI

	select PXA27x

	select IWMMXT

	select PXA25x

arch/arm/mach-pxa/clock-pxa2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/syscore_ops.h>



#include <mach/pxa2xx-regs.h>

arch/arm/mach-pxa/corgi_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/apm-emulation.h>

#include <linux/io.h>



#include <asm/irq.h>

#include <asm/mach-types.h>