diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2011-01-05 16:27:03 +0530 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-01-07 13:33:09 -0800 |
| commit | dd361b6ff6de54f628e55a39b8667108589c74bf (patch) | |
| tree | 701dacb4626a17101bd94955bbd774d6169a33b8 /arch/arm/plat-omap/include/plat/voltage.h | |
| parent | d7e08f1b8fcb85968c35ddecbf912bdab4cf2508 (diff) | |
| download | linux-3.10-dd361b6ff6de54f628e55a39b8667108589c74bf.tar.gz linux-3.10-dd361b6ff6de54f628e55a39b8667108589c74bf.tar.bz2 linux-3.10-dd361b6ff6de54f628e55a39b8667108589c74bf.zip | |
omap2plus: voltage: Trivial linking fix 'undefined reference'
LD init/built-in.o
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `omap2_set_init_voltage':
arch/arm/mach-omap2/pm.c:181: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/built-in.o: In function `omap4_twl_init':
arch/arm/mach-omap2/omap_twl.c:244: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:247: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:250: undefined reference to `omap_voltage_domain_lookup'
make: *** [.tmp_vmlinux1] Error 1
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/voltage.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/voltage.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h index 9943c667f8e..4b02227e409 100644 --- a/arch/arm/plat-omap/include/plat/voltage.h +++ b/arch/arm/plat-omap/include/plat/voltage.h @@ -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 @@ -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, @@ -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 |