From 9308c4299c2cfa177914e3c862a13d527cccbfa0 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sun, 11 Mar 2012 16:06:03 -0700
Subject: [PATCH] --- yaml --- r: 294031 b: refs/heads/master c:
 b51425becfe127e0c17a8501ffa079b37241ed11 h: refs/heads/master i:   294029:
 a3f316c99a673d006dae35df5e31506d06de6846   294027:
 b6e01c07ef3a3bd1d5246f7bed348c6285355ed7   294023:
 46970194988f81ba7b83bf4062253cb1f88b5895   294015:
 6c666e74385ab5920f66cdc525fc06046d5f7050 v: v3

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

diff --git a/[refs] b/[refs]
index d7171cbedb7e..9646779d82ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05b7b842fa1798c4775997602d42f3d6373e7ef3
+refs/heads/master: b51425becfe127e0c17a8501ffa079b37241ed11
diff --git a/trunk/drivers/input/touchscreen/hp680_ts_input.c b/trunk/drivers/input/touchscreen/hp680_ts_input.c
index 639a6044183d..85cf9bee8018 100644
--- a/trunk/drivers/input/touchscreen/hp680_ts_input.c
+++ b/trunk/drivers/input/touchscreen/hp680_ts_input.c
@@ -93,7 +93,7 @@ static int __init hp680_ts_init(void)
 	hp680_ts_dev->phys = "hp680_ts/input0";
 
 	if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
-			0, MODNAME, 0) < 0) {
+			0, MODNAME, NULL) < 0) {
 		printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
 		       HP680_TS_IRQ);
 		err = -EBUSY;