diff --git a/[refs] b/[refs] index 24fbaaa20cee..6c13a531af5d 100644 --- 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 index 0d82c47056ef..7bfa3dd0fd5e 100644 --- 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 index 6575b8f352c9..a1b39c4674da 100644 --- 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 = {