diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
| commit | 01deeef1e25035bbaca9bc580c88dc7cdbc85363 (patch) | |
| tree | 1994c9cede5c10eb07f53ecf76f2afcedd1e0c13 /arch/arm/mach-spear3xx/include/mach/vmalloc.h | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'rmk-devel-stable' into linux-linaro-tracking
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach/vmalloc.h')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 |
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 df977b3c9a6..00000000000 --- 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 */ |