diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:45 +0100 |
| commit | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (patch) | |
| tree | a8318a34fbbb373403239b12e4ac921ab375e9a9 /arch/arm/mach-u300/include | |
| parent | Linux 3.1-rc3 (diff) | |
| parent | ARM: Remove support for macro CONSISTENT_DMA_SIZE (diff) | |
| download | linux-dev-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.tar.xz linux-dev-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.zip | |
Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-u300/include')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h index 888e2e351ee1..38741da0d261 100644 --- a/arch/arm/mach-u300/include/mach/memory.h +++ b/arch/arm/mach-u300/include/mach/memory.h @@ -34,9 +34,4 @@ (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100) #endif -/* - * We enable a real big DMA buffer if need be. - */ -#define CONSISTENT_DMA_SIZE SZ_4M - #endif |