From b2605aff4106c3429cb15c828cb001c5823111f7 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 11 Apr 2009 16:50:17 -0700
Subject: [PATCH] --- yaml --- r: 143527 b: refs/heads/master c:
 4f295232bef43adf648876a0cd950faa99daa5f1 h: refs/heads/master i:   143525:
 af2979889d34a9f9fde09cadc7272519b04ff950   143523:
 53e8bbb53abe2e738c33579c8a0d8a6bd0a7a6cd   143519:
 dcb8c10d7a3dbdea4c80cb92163919b328a2e81f v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/input/touchscreen/wm97xx-core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4e08ce6cce98..4b2c55c9c152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd746d540abf8c686f5f868ae62112692e684088
+refs/heads/master: 4f295232bef43adf648876a0cd950faa99daa5f1
diff --git a/trunk/drivers/input/touchscreen/wm97xx-core.c b/trunk/drivers/input/touchscreen/wm97xx-core.c
index cec480bffe38..69af8385ab14 100644
--- a/trunk/drivers/input/touchscreen/wm97xx-core.c
+++ b/trunk/drivers/input/touchscreen/wm97xx-core.c
@@ -370,8 +370,7 @@ static int wm97xx_init_pen_irq(struct wm97xx *wm)
 	 * provided. */
 	BUG_ON(!wm->mach_ops->irq_enable);
 
-	if (request_irq(wm->pen_irq, wm97xx_pen_interrupt,
-			IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+	if (request_irq(wm->pen_irq, wm97xx_pen_interrupt, IRQF_SHARED,
 			"wm97xx-pen", wm)) {
 		dev_err(wm->dev,
 			"Failed to register pen down interrupt, polling");