diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 17:40:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 17:41:06 -0400 |
| commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
| tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/plat-s3c/include/plat/adc.h | |
| parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
| parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) | |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
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 43df2a404b0b..d847bd476b6c 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; | |||
| 19 | extern int s3c_adc_start(struct s3c_adc_client *client, | 19 | extern int s3c_adc_start(struct s3c_adc_client *client, |
| 20 | unsigned int channel, unsigned int nr_samples); | 20 | unsigned int channel, unsigned int nr_samples); |
| 21 | 21 | ||
| 22 | extern struct s3c_adc_client *s3c_adc_register(struct platform_device *pdev, | 22 | extern struct s3c_adc_client * |
| 23 | void (*select)(unsigned selected), | 23 | s3c_adc_register(struct platform_device *pdev, |
| 24 | void (*conv)(unsigned d0, unsigned d1), | 24 | void (*select)(unsigned selected), |
| 25 | unsigned int is_ts); | 25 | void (*conv)(unsigned d0, unsigned d1, |
| 26 | unsigned *samples_left), | ||
| 27 | unsigned int is_ts); | ||
| 26 | 28 | ||
| 27 | extern void s3c_adc_release(struct s3c_adc_client *client); | 29 | extern void s3c_adc_release(struct s3c_adc_client *client); |
| 28 | 30 | ||