---

yaml --- r: 372645 b: refs/heads/master c: d363ca4 h: refs/heads/master i: 372643: e7415b8 v: v3
git-mirror · Mar 15, 2013 · 90c2129 · 90c2129
1 parent 656758a
commit 90c2129
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097eb1c400b56a80e777536bd643185049b6a255
+refs/heads/master: d363ca43f1ecec7a670a16470cdc5353cde39691
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h b/trunk/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -124,13 +124,13 @@ enum {
 	GPIO_FN_XWUP,
 	GPIO_FN_VACK,
 	GPIO_FN_XTAL1L,
-	GPIO_FN_PORT49_IRDA_OUT, GPIO_FN_PORT49_IROUT,
+	GPIO_FN_PORT49_IROUT,
 	GPIO_FN_BBIF2_TSYNC2, GPIO_FN_TPU2TO2,
 
 	GPIO_FN_BBIF2_TSCK2, GPIO_FN_TPU2TO3,
 	GPIO_FN_BBIF2_TXD2,
-	GPIO_FN_PORT53_IRDA_IN, GPIO_FN_TPU3TO3,
-	GPIO_FN_PORT54_IRDA_FIRSEL, GPIO_FN_TPU3TO2,
+	GPIO_FN_TPU3TO3,
+	GPIO_FN_TPU3TO2,
 	GPIO_FN_TPU0TO0,
 	GPIO_FN_A0, GPIO_FN_BS_,
 	GPIO_FN_A12, GPIO_FN_TPU4TO2,
@@ -255,10 +255,10 @@ enum {
 	GPIO_FN_MSIOF1_MCK1,
 	GPIO_FN_MSIOF1_SS1, GPIO_FN_VIO2_FIELD2,
 	GPIO_FN_MSIOF1_SS2, GPIO_FN_VIO2_HD2,
-	GPIO_FN_PORT241_IRDA_OUT, GPIO_FN_PORT241_IROUT, GPIO_FN_MFG4_OUT1, \
+	GPIO_FN_PORT241_IROUT, GPIO_FN_MFG4_OUT1, \
 	GPIO_FN_TPU4TO0,
-	GPIO_FN_PORT242_IRDA_IN, GPIO_FN_MFG4_IN2,
-	GPIO_FN_PORT243_IRDA_FIRSEL, GPIO_FN_PORT243_VIO_CKO2,
+	GPIO_FN_MFG4_IN2,
+	GPIO_FN_PORT243_VIO_CKO2,
 	GPIO_FN_MFG2_IN1,
 	GPIO_FN_MSIOF2R_RXD,
 	GPIO_FN_MFG2_IN2,