X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Finput%2Ftouchscreen%2Fs3c2410_ts.c;h=1173890f6719ca5c801276f3585d0e9ab6b67e0c;hb=24ed960abf1d50cb7834e99a0cfc081bc0656712;hp=d3265b6b58b8ebc06b69e8a40983d5303b938054;hpb=9c7a867ebdef0d484a4c9329007179fbbd08affc;p=tomoyo%2Ftomoyo-test1.git

diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index d3265b6b58b8..1173890f6719 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -102,7 +102,7 @@ static inline bool get_down(unsigned long data0, unsigned long data1)
 		!(data1 & S3C2410_ADCDAT0_UPDOWN));
 }
 
-static void touch_timer_fire(unsigned long data)
+static void touch_timer_fire(struct timer_list *unused)
 {
 	unsigned long data0;
 	unsigned long data1;