diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2011-01-05 05:57:03 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-01-07 16:33:09 -0500 |
commit | dd361b6ff6de54f628e55a39b8667108589c74bf (patch) | |
tree | 701dacb4626a17101bd94955bbd774d6169a33b8 /arch/arm/plat-omap | |
parent | d7e08f1b8fcb85968c35ddecbf912bdab4cf2508 (diff) |
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')
-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 9943c667f8e1..4b02227e4098 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 { | |||
65 | char *name; | 65 | char *name; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | /* API to get the voltagedomain pointer */ | ||
69 | struct voltagedomain *omap_voltage_domain_lookup(char *name); | ||
70 | |||
71 | /** | 68 | /** |
72 | * struct omap_volt_data - Omap voltage specific data. | 69 | * struct omap_volt_data - Omap voltage specific data. |
73 | * @voltage_nominal: The possible voltage value in uV | 70 | * @voltage_nominal: The possible voltage value in uV |
@@ -131,6 +128,9 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm, | |||
131 | struct omap_volt_pmic_info *pmic_info); | 128 | struct omap_volt_pmic_info *pmic_info); |
132 | void omap_change_voltscale_method(struct voltagedomain *voltdm, | 129 | void omap_change_voltscale_method(struct voltagedomain *voltdm, |
133 | int voltscale_method); | 130 | int voltscale_method); |
131 | /* API to get the voltagedomain pointer */ | ||
132 | struct voltagedomain *omap_voltage_domain_lookup(char *name); | ||
133 | |||
134 | int omap_voltage_late_init(void); | 134 | int omap_voltage_late_init(void); |
135 | #else | 135 | #else |
136 | static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm, | 136 | static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm, |
@@ -144,6 +144,10 @@ static inline int omap_voltage_late_init(void) | |||
144 | { | 144 | { |
145 | return -EINVAL; | 145 | return -EINVAL; |
146 | } | 146 | } |
147 | static inline struct voltagedomain *omap_voltage_domain_lookup(char *name) | ||
148 | { | ||
149 | return ERR_PTR(-EINVAL); | ||
150 | } | ||
147 | #endif | 151 | #endif |
148 | 152 | ||
149 | #endif | 153 | #endif |