From 03a53bc5d4d75d1ed5eac5debd39f9a96313e2eb Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 5 Nov 2012 16:10:32 +0100
Subject: [PATCH] --- yaml --- r: 344954 b: refs/heads/master c:
 5204e51d30ceb9715e3d690efe84c50e2e9d557d h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/mfd/stmpe.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 783d6ec350db..004437227806 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76f93992e4c44f30be797d5c99d6f369ed001747
+refs/heads/master: 5204e51d30ceb9715e3d690efe84c50e2e9d557d
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
index 5c8d8f260df2..e50ebdfeed0f 100644
--- a/trunk/drivers/mfd/stmpe.c
+++ b/trunk/drivers/mfd/stmpe.c
@@ -519,12 +519,12 @@ static const u8 stmpe1601_regs[] = {
 static struct stmpe_variant_block stmpe1601_blocks[] = {
 	{
 		.cell	= &stmpe_gpio_cell,
-		.irq	= STMPE24XX_IRQ_GPIOC,
+		.irq	= STMPE1601_IRQ_GPIOC,
 		.block	= STMPE_BLOCK_GPIO,
 	},
 	{
 		.cell	= &stmpe_keypad_cell,
-		.irq	= STMPE24XX_IRQ_KEYPAD,
+		.irq	= STMPE1601_IRQ_KEYPAD,
 		.block	= STMPE_BLOCK_KEYPAD,
 	},
 };