diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-27 19:09:06 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-27 19:09:06 +0100 |
| commit | be00f07200a2e1357e629a5d79c6add33c4dbf30 (patch) | |
| tree | ffbb5c3eb93f27e6c3aacda5c325601cf7ab6360 | |
| parent | 61a317f3045240ea577a137c480c9d1fe76ad43a (diff) | |
| parent | 39a11539dc263d714c015da2a411a46190274c46 (diff) | |
Merge branch 's3c-touchscreen-2.6.32' into om-gta02-2.6.32
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index db083a16284..97def9d620e 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -160,7 +160,7 @@ static void s3c2410_ts_start_adc_conversion(void) } /* Callback for the s3c-adc API. */ -void adc_selected_f(unsigned selected) +void adc_selected_f(struct s3c_adc_client *client, unsigned selected) { ts.adc_selected = selected; } @@ -299,7 +299,7 @@ static irqreturn_t stylus_updown(int irq, void *dev_id) return IRQ_HANDLED; } -static void stylus_adc_action(unsigned p0, unsigned p1, unsigned *conv_left) +static void stylus_adc_action(struct s3c_adc_client *client, unsigned p0, unsigned p1, unsigned *conv_left) { int buf[3]; |