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-shmobile/include | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| parent | 97fef8bda9f32a2b1919501122d6bd6871af06dc (diff) | |
| download | talos-op-linux-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.tar.gz talos-op-linux-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.zip | |
Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/memory.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/memory.h b/arch/arm/mach-shmobile/include/mach/memory.h index ad00c3c258f4..0ffbe8155c76 100644 --- a/arch/arm/mach-shmobile/include/mach/memory.h +++ b/arch/arm/mach-shmobile/include/mach/memory.h @@ -4,7 +4,4 @@ #define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START) #define MEM_SIZE UL(CONFIG_MEMORY_SIZE) -/* DMA memory at 0xf6000000 - 0xffdfffff */ -#define CONSISTENT_DMA_SIZE (158 << 20) - #endif /* __ASM_MACH_MEMORY_H */ |
