tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'regulator-core', 'regulator-dt' and 'regulator-dummy' into regulator-next

Browse Source
This commit is contained in:
Mark Brown
2012-07-22 19:31:41 +01:00
parent 1beaf762b4 86f5fcfc3e 15719ccc27
commit 8cfc545e0e
1019 changed files with 11989 additions and 5560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/regulator/fixed.h
+7 -4
View File
@@ -58,14 +58,17 @@ struct fixed_voltage_config {
struct regulator_consumer_supply;
#if IS_ENABLED(CONFIG_REGULATOR)
struct platform_device *regulator_register_fixed(int id,
struct regulator_consumer_supply *supplies, int num_supplies);
struct platform_device *regulator_register_always_on(int id, const char *name,
struct regulator_consumer_supply *supplies, int num_supplies, int uv);
#else
static inline struct platform_device *regulator_register_fixed(int id,
struct regulator_consumer_supply *supplies, int num_supplies)
static inline struct platform_device *regulator_register_always_on(int id, const char *name,
struct regulator_consumer_supply *supplies, int num_supplies, int uv)
{
return NULL;
}
#endif
#define regulator_register_fixed(id, s, ns) regulator_register_always_on(id, \
"fixed-dummy", s, ns, 0)
#endif