summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-05 22:52:54 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-10-13 12:49:33 -0400
commit6b0e7f69ad24613c09a1bb6632d448885cf7b034 (patch)
treecdd90808471eca848c30b4a058b41a5a6901475d
parent489a1b5b894d6df2908b914ee9d0619a8ffc8e3e (diff)
downloadop-kernel-dev-6b0e7f69ad24613c09a1bb6632d448885cf7b034.zip
op-kernel-dev-6b0e7f69ad24613c09a1bb6632d448885cf7b034.tar.gz
ARM: mach-nomadik: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-nomadik/include/mach/memory.h28
2 files changed, 1 insertions, 28 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ac2051..57d805e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -874,6 +874,7 @@ config ARCH_NOMADIK
select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS
select ARCH_REQUIRE_GPIOLIB
+ select NO_MACH_MEMORY_H
help
Support for the Nomadik platform by ST-Ericsson
diff --git a/arch/arm/mach-nomadik/include/mach/memory.h b/arch/arm/mach-nomadik/include/mach/memory.h
deleted file mode 100644
index d332521..0000000
--- a/arch/arm/mach-nomadik/include/mach/memory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * mach-nomadik/include/mach/memory.h
- *
- * Copyright (C) 1999 ARM Limited
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET UL(0x00000000)
-
-#endif
OpenPOWER on IntegriCloud