Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx25-pinfunc.h

diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h
index f840f03ad1719ba7dabbb18bc53652a96189fe09..6c63dca1b9b8fcc3229f03ae7571e8df3922913e 100644 (file)
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -17,8 +17,6 @@
  * <mux_reg conf_reg input_reg mux_mode input_val>
  */
 
-#define MX25_PAD_TDO__TDO                      0x000 0x3e8 0x000 0x00 0x000
-
 #define MX25_PAD_A10__A10                      0x008 0x000 0x000 0x00 0x000
 #define MX25_PAD_A10__GPIO_4_0                 0x008 0x000 0x000 0x05 0x000
 
@@ -68,7 +66,6 @@
 
 #define MX25_PAD_A22__A22                      0x030 0x000 0x000 0x00 0x000
 #define MX25_PAD_A22__GPIO_2_8                 0x030 0x000 0x000 0x05 0x000
-#define MX25_PAD_A22__FEC_TDATA2               0x030 0x000 0x000 0x07 0x000
 #define MX25_PAD_A22__SIM2_VEN1                        0x030 0x000 0x000 0x06 0x000
 #define MX25_PAD_A22__FEC_TDATA2               0x030 0x000 0x000 0x07 0x000
 
@@ -542,6 +539,8 @@
 #define MX25_PAD_RTCK__OWIRE                   0x1ec 0x3e4 0x000 0x01 0x000
 #define MX25_PAD_RTCK__GPIO_3_14               0x1ec 0x3e4 0x000 0x05 0x000
 
+#define MX25_PAD_TDO__TDO                      0x000 0x3e8 0x000 0x00 0x000
+
 #define MX25_PAD_DE_B__DE_B                    0x1f0 0x3ec 0x000 0x00 0x000
 #define MX25_PAD_DE_B__GPIO_2_20               0x1f0 0x3ec 0x000 0x05 0x000