aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/include/mach/vmalloc.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 00:12:24 -0500
committerOlof Johansson <olof@lixom.net>2011-12-20 00:13:41 -0500
commit844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch)
treefdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mach-iop13xx/include/mach/vmalloc.h
parent5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff)
parenta53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff)
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/mach-iop13xx/include/mach/vmalloc.h')
-rw-r--r--arch/arm/mach-iop13xx/include/mach/vmalloc.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/vmalloc.h b/arch/arm/mach-iop13xx/include/mach/vmalloc.h
deleted file mode 100644
index c5345674034..00000000000
--- a/arch/arm/mach-iop13xx/include/mach/vmalloc.h
+++ /dev/null
@@ -1,4 +0,0 @@
1#ifndef _VMALLOC_H_
2#define _VMALLOC_H_
3#define VMALLOC_END 0xfa000000UL
4#endif