diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 22:17:52 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 22:17:52 (GMT) |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s5pv310/include/mach/vmalloc.h | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
| download | linux-fsl-qoriq-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.xz | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pv310/include/mach/vmalloc.h')
| -rw-r--r-- | arch/arm/mach-s5pv310/include/mach/vmalloc.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/vmalloc.h b/arch/arm/mach-s5pv310/include/mach/vmalloc.h new file mode 100644 index 0000000..3f565eb --- /dev/null +++ b/arch/arm/mach-s5pv310/include/mach/vmalloc.h @@ -0,0 +1,22 @@ +/* linux/arch/arm/mach-s5pv310/include/mach/vmalloc.h + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com/ + * + * Copyright 2010 Ben Dooks <ben-linux@fluff.org> + * + * Based on arch/arm/mach-s5p6440/include/mach/vmalloc.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * S5PV310 vmalloc definition +*/ + +#ifndef __ASM_ARCH_VMALLOC_H +#define __ASM_ARCH_VMALLOC_H __FILE__ + +#define VMALLOC_END (0xF0000000) + +#endif /* __ASM_ARCH_VMALLOC_H */ |