diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:53 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:30 -0400 |
commit | f29781ac69c913272acf915c4d3aacc44af5ddfc (patch) | |
tree | 8ac8211b641f065d4a85e2764e9a56f187f15cb6 | |
parent | 34561b557ff0a3ee0c4bdaf5a5198246e41826e4 (diff) |
ARM: mach-w90x900: 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-w90x900/include/mach/memory.h | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 47a04e59e614..ecc18d51f332 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -590,6 +590,7 @@ config ARCH_W90X900 | |||
590 | select CLKDEV_LOOKUP | 590 | select CLKDEV_LOOKUP |
591 | select CLKSRC_MMIO | 591 | select CLKSRC_MMIO |
592 | select GENERIC_CLOCKEVENTS | 592 | select GENERIC_CLOCKEVENTS |
593 | select NO_MACH_MEMORY_H | ||
593 | help | 594 | help |
594 | Support for Nuvoton (Winbond logic dept.) ARM9 processor, | 595 | Support for Nuvoton (Winbond logic dept.) ARM9 processor, |
595 | At present, the w90x900 has been renamed nuc900, regarding | 596 | At present, the w90x900 has been renamed nuc900, regarding |
diff --git a/arch/arm/mach-w90x900/include/mach/memory.h b/arch/arm/mach-w90x900/include/mach/memory.h deleted file mode 100644 index f02905ba7746..000000000000 --- a/arch/arm/mach-w90x900/include/mach/memory.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-w90x900/include/mach/memory.h | ||
3 | * | ||
4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
8 | * | ||
9 | * Based on arch/arm/mach-s3c2410/include/mach/memory.h | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License as published by | ||
13 | * the Free Software Foundation; either version 2 of the License, or | ||
14 | * (at your option) any later version. | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifndef __ASM_ARCH_MEMORY_H | ||
19 | #define __ASM_ARCH_MEMORY_H | ||
20 | |||
21 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
22 | |||
23 | #endif | ||