summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-11-29 11:24:40 +0100
committerLee Jones <lee.jones@linaro.org>2012-01-05 10:07:58 +0000
commit664b261057869dedc9a9c83fc709936657501614 (patch)
treec431b8487f0b41b5fb072cb040f8bbb85074b2a2
parentaadbc0e168063794209455b52d020d5c943c84f6 (diff)
gpadc.h regression after 3.2 update to merge somewhere
-rw-r--r--include/linux/mfd/ab8500/gpadc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/ab8500/gpadc.h b/include/linux/mfd/ab8500/gpadc.h
index 252966769d9..fa706c5a04a 100644
--- a/include/linux/mfd/ab8500/gpadc.h
+++ b/include/linux/mfd/ab8500/gpadc.h
@@ -26,7 +26,7 @@
struct ab8500_gpadc;
-struct ab8500_gpadc *ab8500_gpadc_get(char *name);
+struct ab8500_gpadc *ab8500_gpadc_get(void);
int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 channel);
int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel);
int ab8500_gpadc_ad_to_voltage(struct ab8500_gpadc *gpadc,