diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:23:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:23:49 -0800 |
| commit | bf785ee0aeea7a3e717cb1e11df4135b6cbde7da (patch) | |
| tree | 32ae52ad51c2a3952f2e1a2af9217717954fa593 /include/asm-arm/memory.h | |
| parent | 8b87e1baff24e586c3fe6c168843d213119bf4dd (diff) | |
| parent | 00431707be0cc1236ee08459367872b57da5be29 (diff) | |
| download | linux-bf785ee0aeea7a3e717cb1e11df4135b6cbde7da.tar.gz linux-bf785ee0aeea7a3e717cb1e11df4135b6cbde7da.tar.bz2 linux-bf785ee0aeea7a3e717cb1e11df4135b6cbde7da.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 3d7f08bd9030..b4e1146ab682 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -25,6 +25,7 @@ #include <linux/config.h> #include <linux/compiler.h> #include <asm/arch/memory.h> +#include <asm/sizes.h> #ifndef TASK_SIZE /* @@ -48,6 +49,14 @@ #endif /* + * Size of DMA-consistent memory region. Must be multiple of 2M, + * between 2MB and 14MB inclusive. + */ +#ifndef CONSISTENT_DMA_SIZE +#define CONSISTENT_DMA_SIZE SZ_2M +#endif + +/* * Physical vs virtual RAM address space conversion. These are * private definitions which should NOT be used outside memory.h * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. |