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 47a04e59e61..ecc18d51f33 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -590,6 +590,7 @@ config ARCH_W90X900 select CLKDEV_LOOKUP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS + select NO_MACH_MEMORY_H help Support for Nuvoton (Winbond logic dept.) ARM9 processor, 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 f02905ba774..00000000000 --- a/arch/arm/mach-w90x900/include/mach/memory.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * arch/arm/mach-w90x900/include/mach/memory.h - * - * Copyright (c) 2008 Nuvoton technology corporation - * All rights reserved. - * - * Wan ZongShun <mcuos.com@gmail.com> - * - * Based on arch/arm/mach-s3c2410/include/mach/memory.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif |