diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-20 00:12:47 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-20 00:12:53 -0500 |
commit | 4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (patch) | |
tree | 0ac643f1a0c57a88452ef017c61d325fab98d00a /arch/arm/mach-mv78xx0 | |
parent | f68453e076dcf140c4a7bdd385f239b1e41be983 (diff) | |
parent | 1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b (diff) |
Merge branch 'picoxcell/devel' into next/devel
* picoxcell/devel: (1 commit)
ARM: picoxcell: implement watchdog restart
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/vmalloc.h b/arch/arm/mach-mv78xx0/include/mach/vmalloc.h deleted file mode 100644 index ba26fe98e640..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/vmalloc.h +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-mv78xx0/include/mach/vmalloc.h | ||
3 | */ | ||
4 | |||
5 | #define VMALLOC_END 0xfe000000UL | ||