diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-04-28 12:01:16 +0100 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-06-15 11:18:23 +0100 |
| commit | 7c314991d7d7ad4edf96e8322bcb30e8452957b7 (patch) | |
| tree | e6ff0860de3f408f9f5ce960cf314e95cb05ae74 /drivers/regulator | |
| parent | 1d98cccf7f8b944ba4ea56d14bbb7c2eeee59bfe (diff) | |
| download | op-kernel-dev-7c314991d7d7ad4edf96e8322bcb30e8452957b7.zip op-kernel-dev-7c314991d7d7ad4edf96e8322bcb30e8452957b7.tar.gz | |
regulator: build fix for powerpc - renamed show_state
This patch fixes the follwing build failure on powerpc:-
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/regulator/userspace-consumer.c:43: error: conflicting types
> for 'show_state'
> include/linux/sched.h:273: note: previous definition of 'show_state'
> was here
>
> Caused by commit 5defa2bce704ca4151cfe24e4297aa7797cafd22 ("regulator:
> add userspace-consumer driver") which I have reverted for today.
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/userspace-consumer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c index 71fcf9d..06d2fa9 100644 --- a/drivers/regulator/userspace-consumer.c +++ b/drivers/regulator/userspace-consumer.c @@ -32,7 +32,7 @@ struct userspace_consumer_data { struct regulator_bulk_data *supplies; }; -static ssize_t show_name(struct device *dev, +static ssize_t reg_show_name(struct device *dev, struct device_attribute *attr, char *buf) { struct userspace_consumer_data *data = dev_get_drvdata(dev); @@ -40,7 +40,7 @@ static ssize_t show_name(struct device *dev, return sprintf(buf, "%s\n", data->name); } -static ssize_t show_state(struct device *dev, +static ssize_t reg_show_state(struct device *dev, struct device_attribute *attr, char *buf) { struct userspace_consumer_data *data = dev_get_drvdata(dev); @@ -51,7 +51,7 @@ static ssize_t show_state(struct device *dev, return sprintf(buf, "disabled\n"); } -static ssize_t set_state(struct device *dev, struct device_attribute *attr, +static ssize_t reg_set_state(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct userspace_consumer_data *data = dev_get_drvdata(dev); @@ -90,8 +90,8 @@ static ssize_t set_state(struct device *dev, struct device_attribute *attr, return count; } -static DEVICE_ATTR(name, 0444, show_name, NULL); -static DEVICE_ATTR(state, 0644, show_state, set_state); +static DEVICE_ATTR(name, 0444, reg_show_name, NULL); +static DEVICE_ATTR(state, 0644, reg_show_state, reg_set_state); static struct device_attribute *attributes[] = { &dev_attr_name, |
