Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / arch / arm / mach-ux500 / board-mop500.c

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 0bc0aa3..a1c9ea1 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -71,7 +71,11 @@ static pin_cfg_t mop500_pins[] = {
        GPIO167_KP_O1,
        GPIO168_KP_O0,
 
-       GPIO217_GPIO,           /* GPIO_EXP_INT */
+       /* GPIO_EXP_INT */
+       GPIO217_GPIO,
+
+       /* STMPE1601 IRQ */
+       GPIO218_GPIO    | PIN_INPUT_PULLUP,
 };
 
 static struct ab8500_platform_data ab8500_platdata = {