Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231109
b: refs/heads/master
c: dd361b6
h: refs/heads/master
i:
  231107: bb3e784
v: v3
  • Loading branch information
Santosh Shilimkar authored and Kevin Hilman committed Jan 7, 2011
1 parent cca909e commit c40f285
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d7e08f1b8fcb85968c35ddecbf912bdab4cf2508
refs/heads/master: dd361b6ff6de54f628e55a39b8667108589c74bf
10 changes: 7 additions & 3 deletions trunk/arch/arm/plat-omap/include/plat/voltage.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ struct voltagedomain {
char *name;
};

/* API to get the voltagedomain pointer */
struct voltagedomain *omap_voltage_domain_lookup(char *name);

/**
* struct omap_volt_data - Omap voltage specific data.
* @voltage_nominal: The possible voltage value in uV
Expand Down Expand Up @@ -131,6 +128,9 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm,
struct omap_volt_pmic_info *pmic_info);
void omap_change_voltscale_method(struct voltagedomain *voltdm,
int voltscale_method);
/* API to get the voltagedomain pointer */
struct voltagedomain *omap_voltage_domain_lookup(char *name);

int omap_voltage_late_init(void);
#else
static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
Expand All @@ -144,6 +144,10 @@ static inline int omap_voltage_late_init(void)
{
return -EINVAL;
}
static inline struct voltagedomain *omap_voltage_domain_lookup(char *name)
{
return ERR_PTR(-EINVAL);
}
#endif

#endif

0 comments on commit c40f285

Please sign in to comment.