git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
drivers
/
regulator
/
fixed-helper.c
diff --git
a/drivers/regulator/fixed-helper.c
b/drivers/regulator/fixed-helper.c
index
30d0a15
..
cacd33c
100644
(file)
--- a/
drivers/regulator/fixed-helper.c
+++ b/
drivers/regulator/fixed-helper.c
@@
-18,7
+18,6
@@
static void regulator_fixed_release(struct device *dev)
/**
* regulator_register_fixed - register a no-op fixed regulator
/**
* regulator_register_fixed - register a no-op fixed regulator
- * @name: supply name
* @id: platform device id
* @supplies: consumers for this regulator
* @num_supplies: number of consumers
* @id: platform device id
* @supplies: consumers for this regulator
* @num_supplies: number of consumers
@@
-32,7
+31,7
@@
struct platform_device *regulator_register_fixed(int id,
if (!data)
return NULL;
if (!data)
return NULL;
- data->cfg.supply_name = "dummy";
+ data->cfg.supply_name = "
fixed-
dummy";
data->cfg.microvolts = 0;
data->cfg.gpio = -EINVAL;
data->cfg.enabled_at_boot = 1;
data->cfg.microvolts = 0;
data->cfg.gpio = -EINVAL;
data->cfg.enabled_at_boot = 1;