summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24a0/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 13:27:34 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 13:27:34 +0200
commitf9cef506815386df4bd7e463b59e0a0984ce0355 (patch)
treeb26a202b2f0472e3ebe889012312b115917717f9 /arch/arm/mach-s3c24a0/include
parentMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff)
parentARM: S5PV310: Support ethernet for SMDKV310 and SMDKC210 (diff)
downloadlinux-f9cef506815386df4bd7e463b59e0a0984ce0355.tar.xz
linux-f9cef506815386df4bd7e463b59e0a0984ce0355.zip
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-s3c24a0/include')
-rw-r--r--arch/arm/mach-s3c24a0/include/mach/vmalloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24a0/include/mach/vmalloc.h b/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
index 914656820794..6480b15277f3 100644
--- a/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
+++ b/arch/arm/mach-s3c24a0/include/mach/vmalloc.h
@@ -12,6 +12,6 @@
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H
-#define VMALLOC_END (0xe0000000UL)
+#define VMALLOC_END 0xF6000000UL
#endif /* __ASM_ARCH_VMALLOC_H */