summaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear3xx
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 03:27:54 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 03:27:59 +0400
commit73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch)
tree4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-spear3xx
parent742eaa6a6e356a16788ce6530271de89bc4f8fb5 (diff)
parent0af362f8440a78b970d5f215e234420fa87d0f3f (diff)
downloadlinux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-spear3xx')
-rw-r--r--arch/arm/mach-spear3xx/include/mach/vmalloc.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/vmalloc.h b/arch/arm/mach-spear3xx/include/mach/vmalloc.h
deleted file mode 100644
index df977b3c9a63..000000000000
--- a/arch/arm/mach-spear3xx/include/mach/vmalloc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-spear3xx/include/mach/vmalloc.h
- *
- * Defining Vmalloc area for SPEAr3xx machine family
- *
- * Copyright (C) 2009 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_VMALLOC_H
-#define __MACH_VMALLOC_H
-
-#include <plat/vmalloc.h>
-
-#endif /* __MACH_VMALLOC_H */