From 9e6a68405f1297b371b6a83a335545480d9dc8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Mon, 15 Feb 2010 20:50:57 +0100
Subject: [PATCH] --- yaml --- r: 187560 b: refs/heads/master c:
 e76feb87422c0bb7517cd97be342f55fab743d3a h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../arm/plat-mxc/include/mach/iomux-mx25.h    | 20 +++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 9b08ecabaced..e7826e112773 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6985a719f96e1d83258b47eb170bf44969860ca3
+refs/heads/master: e76feb87422c0bb7517cd97be342f55fab743d3a
diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h
index a4fbef684035..c6ebec72847a 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-mx25.h
@@ -16,24 +16,11 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  */
-#ifndef __IOMUX_MX25_H__
-#define __IOMUX_MX25_H__
+#ifndef __MACH_IOMUX_MX25_H__
+#define __MACH_IOMUX_MX25_H__
 
 #include <mach/iomux-v3.h>
 
-#ifndef GPIO_PORTA
-#error Please include mach/iomux.h
-#endif
-
-/*
- *
- * @brief MX25 I/O Pin List
- *
- * @ingroup GPIO_MX25
- */
-
-#ifndef __ASSEMBLY__
-
 /*
  * IOMUX/PAD Bit field definitions
  */
@@ -513,5 +500,4 @@
 #define MX25_PAD_CTL_GRP_DVS_SDHC1	IOMUX_PAD(0x458, 0x000, 0, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CTL_GRP_DVS_LCD	IOMUX_PAD(0x45c, 0x000, 0, 0, 0, NO_PAD_CTRL)
 
-#endif // __ASSEMBLY__
-#endif // __IOMUX_MX25_H__
+#endif /* __MACH_IOMUX_MX25_H__ */