From b8cdb000085091f4ff2bd675d0017c0cb2e21c52 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 9 May 2011 18:29:00 +0200 Subject: [PATCH] --- yaml --- r: 258677 b: refs/heads/master c: c0450dfffcbc2b4949cfbaab2928a0828dbd6305 h: refs/heads/master i: 258675: 136faa7f8bacaf8f00939b8691fed29f82bd3b48 v: v3 --- [refs] | 2 +- .../arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- trunk/arch/arm/plat-mxc/include/mach/iomux.h | 26 ------------------- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/iomux.h diff --git a/[refs] b/[refs] index 4197f0f05733..2a502f8c2c07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4daca0e0170b3996a403d10b6b5838a69785faeb +refs/heads/master: c0450dfffcbc2b4949cfbaab2928a0828dbd6305 diff --git a/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index 7ae43b1ec517..686449696543 100644 --- a/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/trunk/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "devices-imx27.h" diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux.h b/trunk/arch/arm/plat-mxc/include/mach/iomux.h deleted file mode 100644 index 3d226d7e7be2..000000000000 --- a/trunk/arch/arm/plat-mxc/include/mach/iomux.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2010 Uwe Kleine-Koenig, Pengutronix - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - */ -#ifndef __MACH_IOMUX_H__ -#define __MACH_IOMUX_H__ - -/* This file will go away, please include mach/iomux-mx... directly */ - -#ifdef CONFIG_ARCH_MX1 -#include -#endif -#ifdef CONFIG_ARCH_MX2 -#include -#ifdef CONFIG_MACH_MX21 -#include -#endif -#ifdef CONFIG_MACH_MX27 -#include -#endif -#endif - -#endif /* __MACH_IOMUX_H__ */