From 833a29a6e9c139dcf3f70c0a2bccc7d7fff95e7e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270201 b: refs/heads/master c: a109d811bab30d44ee775a9f15348add7014180c h: refs/heads/master i: 270199: 7c1b0dbd4951f051ff1917c0628a40c3f876f7a2 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-mxs/include/mach/memory.h | 24 ------------------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 trunk/arch/arm/mach-mxs/include/mach/memory.h diff --git a/[refs] b/[refs] index aa9a715cb079..6d04e9b81422 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94cc0a78474078e7533ccc71e9b90ee3063c843a +refs/heads/master: a109d811bab30d44ee775a9f15348add7014180c diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index f690b5477604..cb4ac95297b4 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -416,6 +416,7 @@ config ARCH_MXS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select NO_MACH_MEMORY_H help Support for Freescale MXS-based family of processors diff --git a/trunk/arch/arm/mach-mxs/include/mach/memory.h b/trunk/arch/arm/mach-mxs/include/mach/memory.h deleted file mode 100644 index b5420a5c2d4b..000000000000 --- a/trunk/arch/arm/mach-mxs/include/mach/memory.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __MACH_MXS_MEMORY_H__ -#define __MACH_MXS_MEMORY_H__ - -#define PHYS_OFFSET UL(0x40000000) - -#endif /* __MACH_MXS_MEMORY_H__ */