linux3.10:pwm:modify config rk30_PWM_RERGULATOR to ROCKCHIP_PWM_REGULATOR

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index d62e7cce96d556350b9000b06e0a919d6d4eee01..c6a6f1da0847e960918816ae9bff077d3c79d030 100755 (executable)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -309,7 +309,7 @@ CONFIG_MFD_RK808=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8846=y
-CONFIG_RK30_PWM_REGULATOR=y
+CONFIG_ROCKCHIP_PWM_REGULATOR=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 0788f8470dd1d29c851d5c6e1b8d9d2d9de4ccb0..3afbb5d2adea1f7477f2b8fb5d1e6f9ffcd99298 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -262,10 +262,10 @@ config ACT8846_SUPPORT_RESET
        help
          Support short press key to restart.
 
-config RK30_PWM_REGULATOR
-       tristate "rk30 pwm voltage regulator for discrete dcdc or ldo"
+config ROCKCHIP_PWM_REGULATOR
+       tristate "rockchip pwm voltage regulator for discrete dcdc or ldo"
        help
-         Say Y to enable support for the voltage regulators control on the RK30 .
+         Say Y to enable support for the voltage regulators control on the ROCKCHIP.
 
 config REGULATOR_PCAP
        tristate "Motorola PCAP2 regulator driver"

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index bc1815fd5672ebc9d6c2bccc572cb46ca25516a3..74658dbb3d3f0e32f28a9e9184ba1d3a059456f7 100644 (file)
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
 obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 
-obj-$(CONFIG_RK30_PWM_REGULATOR) += rk30-pwm-regulator.o
+obj-$(CONFIG_ROCKCHIP_PWM_REGULATOR) += rk30-pwm-regulator.o
 
 obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o