summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-11-29 11:24:40 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:07 +0200
commit20591b20e6becea4e44cb1b0b1cd0a730b1bf125 (patch)
tree5b4a76d22d8e81e7b0ae6a33498e60ca4064f25d /include
parenta44bc2f8bf04d07f529b552876a7575ecaf55e37 (diff)
gpadc.h regression after 3.2 update to merge somewhere
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/abx500/ab8500-gpadc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/abx500/ab8500-gpadc.h b/include/linux/mfd/abx500/ab8500-gpadc.h
index 252966769d9..fa706c5a04a 100644
--- a/include/linux/mfd/abx500/ab8500-gpadc.h
+++ b/include/linux/mfd/abx500/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,