diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-09-27 11:51:26 +0100 |
commit | 464fc937c80ec25b1ac1a8c289a40a290e830e66 (patch) | |
tree | 81442d16f5c58207274949371ea6ec5089c757d8 /arch/arm/plat-s3c/include/plat/adc.h | |
parent | cd38bcdac64aec45575ed58de66db4a2fbf1914d (diff) | |
parent | fa5743d920385c2cf344bb1a0b964af8a9511d85 (diff) |
Merge commit 'refs/remotes/openmoko/andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/adc.h')
-rw-r--r-- | arch/arm/plat-s3c/include/plat/adc.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c/include/plat/adc.h b/arch/arm/plat-s3c/include/plat/adc.h index 43df2a404b0..d847bd476b6 100644 --- a/arch/arm/plat-s3c/include/plat/adc.h +++ b/arch/arm/plat-s3c/include/plat/adc.h @@ -19,10 +19,12 @@ struct s3c_adc_client; extern int s3c_adc_start(struct s3c_adc_client *client, unsigned int channel, unsigned int nr_samples); -extern struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev, - void (*select)(unsigned selected), - void (*conv)(unsigned d0, unsigned d1), - unsigned int is_ts); +extern struct s3c_adc_client * + s3c_adc_register(struct platform_device *pdev, + void (*select)(unsigned selected), + void (*conv)(unsigned d0, unsigned d1, + unsigned *samples_left), + unsigned int is_ts); extern void s3c_adc_release(struct s3c_adc_client *client); |