diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 (patch) | |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 /arch/arm/mach-s3c64xx/include | |
| parent | 9ae21ca362679757786f5abe556c7943e9001426 (diff) | |
| parent | cbff3eb3e6e3c618583a7435f87c1548aa12b0ad (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h index bc0e9138986..23f75e556a3 100644 --- a/arch/arm/mach-s3c64xx/include/mach/vmalloc.h +++ b/arch/arm/mach-s3c64xx/include/mach/vmalloc.h @@ -15,6 +15,6 @@ #ifndef __ASM_ARCH_VMALLOC_H #define __ASM_ARCH_VMALLOC_H -#define VMALLOC_END 0xE0000000UL +#define VMALLOC_END 0xF6000000UL #endif /* __ASM_ARCH_VMALLOC_H */ |