2 files changed, 1 insertions, 28 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ac205106003..57d805e9e241 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 d3325211ba6a..000000000000
--- 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