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-dove | |
| 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-dove')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/dove.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-dove/include/mach/vmalloc.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h index b20ec9af7882..ad1165d488c1 100644 --- a/arch/arm/mach-dove/include/mach/dove.h +++ b/arch/arm/mach-dove/include/mach/dove.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARCH_DOVE_H | 11 | #ifndef __ASM_ARCH_DOVE_H |
| 12 | #define __ASM_ARCH_DOVE_H | 12 | #define __ASM_ARCH_DOVE_H |
| 13 | 13 | ||
| 14 | #include <mach/vmalloc.h> | ||
| 15 | |||
| 16 | /* | 14 | /* |
| 17 | * Marvell Dove address maps. | 15 | * Marvell Dove address maps. |
| 18 | * | 16 | * |
diff --git a/arch/arm/mach-dove/include/mach/vmalloc.h b/arch/arm/mach-dove/include/mach/vmalloc.h deleted file mode 100644 index a28792cf761e..000000000000 --- a/arch/arm/mach-dove/include/mach/vmalloc.h +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-dove/include/mach/vmalloc.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #define VMALLOC_END 0xfd800000UL | ||