summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-highbank
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 00:27:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 00:27:59 +0100
commit73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch)
tree4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-highbank
parentMerge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/... (diff)
parentARM: move VMALLOC_END down temporarily for shmobile (diff)
downloadlinux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz
linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.zip
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r--arch/arm/mach-highbank/include/mach/vmalloc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/include/mach/vmalloc.h b/arch/arm/mach-highbank/include/mach/vmalloc.h
deleted file mode 100644
index 1969e954277a..000000000000
--- a/arch/arm/mach-highbank/include/mach/vmalloc.h
+++ /dev/null
@@ -1 +0,0 @@
-#define VMALLOC_END 0xFEE00000UL