diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 03:27:54 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 03:27:59 +0400 |
| commit | 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch) | |
| tree | 4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-spear6xx | |
| parent | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 (diff) | |
| parent | 0af362f8440a78b970d5f215e234420fa87d0f3f (diff) | |
| download | linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz | |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-spear6xx')
| -rw-r--r-- | arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/vmalloc.h b/arch/arm/mach-spear6xx/include/mach/vmalloc.h deleted file mode 100644 index 4a0b56cb2a91..000000000000 --- a/arch/arm/mach-spear6xx/include/mach/vmalloc.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * arch/arm/mach-spear6xx/include/mach/vmalloc.h - * - * Defining Vmalloc area for SPEAr6xx machine family - * - * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.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 */ |