aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-10-15 08:50:02 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-15 08:50:02 -0400
commit36bd262b3f2ac723dadd20ce35539c8c738877f1 (patch)
tree1ab3a0e5b7b45f4eaf384f0c5d091a522e563d42
parent2326eb985b8844f44e150489c76f5cb56fa381b4 (diff)
[ARM] Fix Zaurii keyboard/touchscreen drivers
The Zaurii drivers were partially fixed up for the IRQ register changes, but unfortunately missed some bits, resulting in build errors. Fix these. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/input/keyboard/corgikbd.c2
-rw-r--r--drivers/input/keyboard/locomokbd.c2
-rw-r--r--drivers/input/keyboard/spitzkbd.c2
-rw-r--r--drivers/input/touchscreen/corgi_ts.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index cb70970625b5..befdd6006b50 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -207,7 +207,7 @@ static irqreturn_t corgikbd_interrupt(int irq, void *dev_id)
207static void corgikbd_timer_callback(unsigned long data) 207static void corgikbd_timer_callback(unsigned long data)
208{ 208{
209 struct corgikbd *corgikbd_data = (struct corgikbd *) data; 209 struct corgikbd *corgikbd_data = (struct corgikbd *) data;
210 corgikbd_scankeyboard(corgikbd_data, NULL); 210 corgikbd_scankeyboard(corgikbd_data);
211} 211}
212 212
213/* 213/*
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index fd33c9cc3272..5788dbc317bb 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -186,7 +186,7 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
186static void locomokbd_timer_callback(unsigned long data) 186static void locomokbd_timer_callback(unsigned long data)
187{ 187{
188 struct locomokbd *locomokbd = (struct locomokbd *) data; 188 struct locomokbd *locomokbd = (struct locomokbd *) data;
189 locomokbd_scankeyboard(locomokbd, NULL); 189 locomokbd_scankeyboard(locomokbd);
190} 190}
191 191
192static int locomokbd_probe(struct locomo_dev *dev) 192static int locomokbd_probe(struct locomo_dev *dev)
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 8b18c009e3e0..28b2748e82d0 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -257,7 +257,7 @@ static void spitzkbd_timer_callback(unsigned long data)
257{ 257{
258 struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data; 258 struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data;
259 259
260 spitzkbd_scankeyboard(spitzkbd_data, NULL); 260 spitzkbd_scankeyboard(spitzkbd_data);
261} 261}
262 262
263/* 263/*
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index ca79b2246195..66121f6a89ad 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -219,7 +219,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
219static void corgi_ts_timer(unsigned long data) 219static void corgi_ts_timer(unsigned long data)
220{ 220{
221 struct corgi_ts *corgits_data = (struct corgi_ts *) data; 221 struct corgi_ts *corgits_data = (struct corgi_ts *) data;
222 ts_interrupt_main(corgits_data, 1, NULL); 222 ts_interrupt_main(corgits_data, 1);
223} 223}
224 224
225static irqreturn_t ts_interrupt(int irq, void *dev_id) 225static irqreturn_t ts_interrupt(int irq, void *dev_id)
@@ -237,7 +237,7 @@ static int corgits_suspend(struct platform_device *dev, pm_message_t state)
237 if (corgi_ts->pendown) { 237 if (corgi_ts->pendown) {
238 del_timer_sync(&corgi_ts->timer); 238 del_timer_sync(&corgi_ts->timer);
239 corgi_ts->tc.pressure = 0; 239 corgi_ts->tc.pressure = 0;
240 new_data(corgi_ts, NULL); 240 new_data(corgi_ts);
241 corgi_ts->pendown = 0; 241 corgi_ts->pendown = 0;
242 } 242 }
243 corgi_ts->power_mode = PWR_MODE_SUSPEND; 243 corgi_ts->power_mode = PWR_MODE_SUSPEND;