diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-20 09:12:24 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-20 09:13:41 +0400 |
commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/plat-spear/include/plat/vmalloc.h | |
parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
download | linux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/plat-spear/include/plat/vmalloc.h')
-rw-r--r-- | arch/arm/plat-spear/include/plat/vmalloc.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/plat-spear/include/plat/vmalloc.h b/arch/arm/plat-spear/include/plat/vmalloc.h deleted file mode 100644 index 8c8b24d07046..000000000000 --- a/arch/arm/plat-spear/include/plat/vmalloc.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * arch/arm/plat-spear/include/plat/vmalloc.h - * - * Defining Vmalloc area for SPEAr platform - * - * 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 __PLAT_VMALLOC_H -#define __PLAT_VMALLOC_H - -#define VMALLOC_END 0xF0000000UL - -#endif /* __PLAT_VMALLOC_H */ |