diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-11 15:07:50 +0200 |
|---|---|---|
| committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:40:16 +0200 |
| commit | 62d1369a3c43515962dfb330225ea05ea7c85554 (patch) | |
| tree | 8515679ffbd3c1db230bd3b298722d79648bf5a1 | |
| parent | 7a00b4bfab344fa53dc5330cc9b9cca2943829a7 (diff) | |
ux500: rename regulator-db8500 to regulator-ux500
regulator-ux500.c will be used for common code between 8500 and 5500.
ST-Ericsson Linux next: -
ST-Ericsson ID: WP257121
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ib23bc00458a1498a4ae8cf540fe40030a0cc3ef5
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22309
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/regulator-ux500.c
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/regulator-ux500.c (renamed from arch/arm/mach-ux500/regulator-db8500.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index caa0eade71d..7482e581e40 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -31,7 +31,7 @@ obj-$(CONFIG_TEE_SVP) += tee_service_svp.o obj-$(CONFIG_TEE_SVP) += tee_ta_start_modem_svp.o obj-$(CONFIG_DB8500_MLOADER) += mloader-db8500.o obj-$(CONFIG_UX500_PRCMU_TIMER) += timer-prcmu.o -obj-$(CONFIG_REGULATOR) += regulator-db8500.o +obj-$(CONFIG_REGULATOR) += regulator-ux500.o obj-$(CONFIG_U8500_REGULATOR_DEBUG) += virt-regulator-u8500.o obj-$(CONFIG_UX500_PRCMU_DEBUG) += prcmu-debug.o obj-$(CONFIG_UX500_PRCMU_QOS_POWER) += prcmu-qos-power.o diff --git a/arch/arm/mach-ux500/regulator-db8500.c b/arch/arm/mach-ux500/regulator-ux500.c index b52530daabe..b52530daabe 100644 --- a/arch/arm/mach-ux500/regulator-db8500.c +++ b/arch/arm/mach-ux500/regulator-ux500.c |