diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:55 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:41 -0400 |
| commit | 9b15e4fe00a136471d4ad22debcb0b270401cefc (patch) | |
| tree | 00893be9987c9e030324e5bfbbfccf6d7c22e03b | |
| parent | 17108711c556b44c1d805bbb3f3ac81011c5dd6a (diff) | |
ARM: mach-mmp: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/memory.h | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 560cc11af7a0..6e277c4487d8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -578,6 +578,7 @@ config ARCH_MMP | |||
| 578 | select TICK_ONESHOT | 578 | select TICK_ONESHOT |
| 579 | select PLAT_PXA | 579 | select PLAT_PXA |
| 580 | select SPARSE_IRQ | 580 | select SPARSE_IRQ |
| 581 | select NO_MACH_MEMORY_H | ||
| 581 | help | 582 | help |
| 582 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. | 583 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. |
| 583 | 584 | ||
diff --git a/arch/arm/mach-mmp/include/mach/memory.h b/arch/arm/mach-mmp/include/mach/memory.h deleted file mode 100644 index d68b50a2d6a0..000000000000 --- a/arch/arm/mach-mmp/include/mach/memory.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-mmp/include/mach/memory.h | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_MACH_MEMORY_H | ||
| 10 | #define __ASM_MACH_MEMORY_H | ||
| 11 | |||
| 12 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 13 | |||
| 14 | #endif /* __ASM_MACH_MEMORY_H */ | ||