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

Commit 756fe285 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  VIDEO: cyberpro: pci_request_regions needs a persistent name
  ARM: dma-isa: request cascade channel after registering it
  ARM: footbridge: trim down old ISA rtc setup
  ARM: fix PAGE_KERNEL
  ARM: Fix wrong shared bit for CPU write buffer bug test
  ARM: 5857/1: ARM: dmabounce: fix build
  ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
  ARM: 5855/1: putc support for nuc900
  ARM: 5854/1: fix compiling error for NUC900
  ARM: 5849/1: ARMv7: fix Oprofile events count
  ARM: add missing include to nwflash.c
  ARM: Kill CONFIG_CPU_32
  ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
  ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
parents eec74a41 ed5a35ac

arch/arm/common/dmabounce.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static inline void unmap_single(struct device *dev, dma_addr_t dma_addr, 
			 * we need to ensure that the data will be coherent

			 * with user mappings.

			 */

			__cpuc_flush_kernel_dcache_area(ptr, size);

			__cpuc_flush_dcache_area(ptr, size);

		}

		free_safe_buffer(dev->archdata.dmabounce, buf);

	}

arch/arm/configs/acs5k_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ CONFIG_MACH_ACS5K=y 
#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_ARM922T=y

CONFIG_CPU_32v4T=y

CONFIG_CPU_ABRT_EV4T=y

arch/arm/configs/acs5k_tiny_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ CONFIG_MACH_ACS5K=y 
#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_ARM922T=y

CONFIG_CPU_32v4T=y

CONFIG_CPU_ABRT_EV4T=y

arch/arm/configs/afeb9260_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ CONFIG_AT91_EARLY_DBGU=y 
#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_ARM926T=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5TJ=y

arch/arm/configs/am200epdkit_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ CONFIG_PXA25x=y 
#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_XSCALE=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5T=y