From 6fc76d3faaf52958b20711c806e802d439a549a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Fri, 28 Feb 2014 10:45:18 +0800 Subject: [PATCH] linux3.10: renamed io_vol_domain to rockchip_io_domain --- drivers/regulator/Makefile | 2 +- .../regulator/{rk_io_vol_domain.c => rockchip_io_vol_domain.c} | 2 +- .../regulator/{rk_io_vol_domain.h => rockchip_io_vol_domain.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/regulator/{rk_io_vol_domain.c => rockchip_io_vol_domain.c} (99%) rename include/linux/regulator/{rk_io_vol_domain.h => rockchip_io_vol_domain.h} (100%) diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 4a96832a4b9c..c627800dd281 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o -obj-$(CONFIG_ARCH_ROCKCHIP) += rk_io_vol_domain.o +obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip_io_vol_domain.o ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG diff --git a/drivers/regulator/rk_io_vol_domain.c b/drivers/regulator/rockchip_io_vol_domain.c similarity index 99% rename from drivers/regulator/rk_io_vol_domain.c rename to drivers/regulator/rockchip_io_vol_domain.c index 1e96e2153130..a1c8243a6f24 100644 --- a/drivers/regulator/rk_io_vol_domain.c +++ b/drivers/regulator/rockchip_io_vol_domain.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include struct io_domain_port *g_uap; diff --git a/include/linux/regulator/rk_io_vol_domain.h b/include/linux/regulator/rockchip_io_vol_domain.h similarity index 100% rename from include/linux/regulator/rk_io_vol_domain.h rename to include/linux/regulator/rockchip_io_vol_domain.h -- 2.34.1