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

Commit 91b90475 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents bcc408b7 f0ffeddc

arch/arm/Kconfig

+8 −5
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ config GENERIC_BUST_SPINLOCK 
config GENERIC_ISA_DMA

	bool



config GENERIC_IOMAP

	bool

	default y



config FIQ

	bool
@@ -202,6 +198,11 @@ config ARCH_H720X 
	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_AAEC2000

	bool "Agilent AAEC-2000 based"

	help

	  This enables support for systems based on the Agilent AAEC-2000



endchoice



source "arch/arm/mach-clps711x/Kconfig"
@@ -234,6 +235,8 @@ source "arch/arm/mach-h720x/Kconfig" 


source "arch/arm/mach-versatile/Kconfig"



source "arch/arm/mach-aaec2000/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool
@@ -277,7 +280,7 @@ config ISA_DMA_API 
	default y



config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000 
 machine-$(CONFIG_ARCH_VERSATILE)  := versatile

 machine-$(CONFIG_ARCH_IMX)	   := imx

 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/common/dmabounce.c

+16 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/dmapool.h>

#include <linux/list.h>



#include <asm/cacheflush.h>



#undef DEBUG



#undef STATS
@@ -302,12 +304,24 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, 


		DO_STATS ( device_info->bounce_count++ );



		if ((dir == DMA_FROM_DEVICE) ||

		    (dir == DMA_BIDIRECTIONAL)) {

		if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {

			unsigned long ptr;



			dev_dbg(dev,

				"%s: copy back safe %p to unsafe %p size %d\n",

				__func__, buf->safe, buf->ptr, size);

			memcpy(buf->ptr, buf->safe, size);



			/*

			 * DMA buffers must have the same cache properties

			 * as if they were really used for DMA - which means

			 * data must be written back to RAM.  Note that

			 * we don't use dmac_flush_range() here for the

			 * bidirectional case because we know the cache

			 * lines will be coherent with the data written.

			 */

			ptr = (unsigned long)buf->ptr;

			dmac_clean_range(ptr, ptr + size);

		}

		free_safe_buffer(device_info, buf);

	}

arch/arm/common/sharpsl_param.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * them early in the boot process, then pass them to the appropriate drivers.

 * Not all devices use all paramaters but the format is common to all.

 */

#ifdef ARCH_SA1100

#ifdef CONFIG_ARCH_SA1100

#define PARAM_BASE	0xe8ffc000

#else

#define PARAM_BASE	0xa0000a00

arch/arm/configs/enp2611_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -50,7 +50,13 @@ CONFIG_BASE_SMALL=0 
#

# Loadable module support

#

# CONFIG_MODULES is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# System Type