---

yaml --- r: 191889 b: refs/heads/master c: aeec134 h: refs/heads/master i: 191887: b9684ff v: v3
git-mirror · May 11, 2010 · 81bf7e0 · 81bf7e0
1 parent 259f597
commit 81bf7e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052345aec01cbd22285771eee6e08486c07d3bcc
+refs/heads/master: aeec1346884688b86ac7f0f36fb30aba30b459d8
diff --git a/trunk/arch/arm/mach-pxa/include/mach/vpac270.h b/trunk/arch/arm/mach-pxa/include/mach/vpac270.h
@@ -37,4 +37,6 @@
 
 #define	GPIO36_VPAC270_IDE_IRQ		36
 
+#define	GPIO113_VPAC270_TS_IRQ		113
+
 #endif
diff --git a/trunk/arch/arm/mach-pxa/vpac270.c b/trunk/arch/arm/mach-pxa/vpac270.c
@@ -388,7 +388,7 @@ static pxa2xx_audio_ops_t vpac270_ac97_pdata = {
 };
 
 static struct ucb1400_pdata vpac270_ucb1400_pdata = {
-	.irq		= IRQ_GPIO(113),
+	.irq		= IRQ_GPIO(GPIO113_VPAC270_TS_IRQ),
 };
 
 static struct platform_device vpac270_ucb1400_device = {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,6 @@

		#define GPIO36_VPAC270_IDE_IRQ 36

		#define GPIO113_VPAC270_TS_IRQ 113

		#endif