diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
| commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
| tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /arch/arm/plat-s3c24xx/adc.c | |
| parent | 5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff) | |
| parent | 51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/plat-s3c24xx/adc.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c index 4d36b784fb8b..df47322492d5 100644 --- a/arch/arm/plat-s3c24xx/adc.c +++ b/arch/arm/plat-s3c24xx/adc.c | |||
| @@ -189,7 +189,7 @@ int s3c_adc_read(struct s3c_adc_client *client, unsigned int ch) | |||
| 189 | err: | 189 | err: |
| 190 | return ret; | 190 | return ret; |
| 191 | } | 191 | } |
| 192 | EXPORT_SYMBOL_GPL(s3c_adc_convert); | 192 | EXPORT_SYMBOL_GPL(s3c_adc_read); |
| 193 | 193 | ||
| 194 | static void s3c_adc_default_select(struct s3c_adc_client *client, | 194 | static void s3c_adc_default_select(struct s3c_adc_client *client, |
| 195 | unsigned select) | 195 | unsigned select) |