diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-04-12 09:13:03 +0530 |
|---|---|---|
| committer | Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> | 2011-04-12 17:44:01 +0200 |
| commit | cae9a89faeb7eb37b6c4a7e587bc53e03badac1c (patch) | |
| tree | 772ff0e1c9bc85e975974e89c80b437954ab60d7 | |
| parent | 67ee318f19157ebc2156eec47d1105bf518c2cb0 (diff) | |
ux500: regulator: fix build failure on 5500u8500-android-2.3_v0.58
To fix this:
arch/arm/mach-ux500/regulator-u8500.c: In function 'enable_epod':
arch/arm/mach-ux500/regulator-u8500.c:239: error: implicit declaration of function 'prcmu_set_epod'
temporarily ifdef out the 8500-specific code in regulator-u8500.c. It's not
possible to exclude it completely for 5500 since the ux500_atomic_* stuff is
implemented here.
Also build the board-mop500-regulators.c file only when MOP500 is being used.
This file does not need to depend on CONFIG_REGULATOR.
Note that the 8500 build is broken without CONFIG_REGULATOR even before this
patch, and this patch does not address that.
ST-Ericsson Linux next: -
ST-Ericsson ID: WP257121
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Id17224135783ca824dbd474e18c4f36598407403
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20624
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 9 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/regulator-u8500.c | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 7d7627c0974..69d0b5738c9 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -11,8 +11,7 @@ obj-y := clock.o timer-mtu.o \ cw1200-wlan.o \ devices-common.o pins.o dcache.o reboot_reasons.o obj-$(CONFIG_PM) += pm/ -obj-$(CONFIG_REGULATOR) += regulator-u8500.o \ - board-mop500-regulators.o +obj-$(CONFIG_REGULATOR) += regulator-u8500.o obj-$(CONFIG_U8500_REGULATOR_DEBUG) += virt-regulator-u8500.o obj-$(CONFIG_ARCH_U8500) += devices.o cpu.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o @@ -21,9 +20,11 @@ obj-$(CONFIG_MACH_SVP5500) += board-svp5500.o obj-$(CONFIG_U8500_MMIO) += board-mop500-mmio.o obj-$(CONFIG_MACH_U8500_MOP) += board-mop500.o board-mop500-msp.o board-mop500-uib.o \ board-mop500-stuib.o board-mop500-u8500uib.o \ - board-mop500-pins.o board-mop500-bm.o + board-mop500-pins.o board-mop500-bm.o \ + board-mop500-regulators.o obj-$(CONFIG_MACH_U8500_PDP) += board-mop500.o board-mop500-msp.o board-mop500-bm.o \ - board-mop500-pins.o # until pdp-specific files are there + board-mop500-pins.o board-mop500-regulators.o + # until pdp-specific files are there obj-$(CONFIG_MOP500_SDI) += board-mop500-sdi.o obj-$(CONFIG_UX500_SOC_DB5500) += devices-db5500.o cpu-db5500.o \ dma-db5500.o timer-db8500.o \ diff --git a/arch/arm/mach-ux500/regulator-u8500.c b/arch/arm/mach-ux500/regulator-u8500.c index bee3f8cc2c3..50ce23d2501 100644 --- a/arch/arm/mach-ux500/regulator-u8500.c +++ b/arch/arm/mach-ux500/regulator-u8500.c @@ -147,6 +147,8 @@ void ux500_regulator_put(struct ux500_regulator *regulator) /* Here for symetric reasons and for possible future use */ } +#ifdef CONFIG_UX500_SOC_DB8500 + /** * struct u8500_regulator_info - u8500 regulator information * @dev: device pointer @@ -649,3 +651,4 @@ MODULE_AUTHOR("STMicroelectronics/ST-Ericsson"); MODULE_DESCRIPTION("U8500 regulator driver"); MODULE_LICENSE("GPL v2"); +#endif /* CONFIG_UX500_SOC_DB8500 */ |