aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2012-07-11 08:06:40 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-16 06:57:35 -0400
commit66c9fbb9895499ff3aede96845968138a5bec8ab (patch)
tree8c2ec903b0c7995e689a80712b8bf9539f4f1cf6 /drivers/regulator
parent1faedca9c7bfd3055204b9d10017ce77ad03fc72 (diff)
mfd: Rename s5m file and directories to samsung
Previously, Samsung PMIC naming rule start with prefix of s5m. But Naming rule is changed. From now on, Prefix will be changed to s2m. So, To support pmic series of s5m and s2m, change mfd file and directory name. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/Kconfig2
-rw-r--r--drivers/regulator/s5m8767.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index c86b8864e411..12c0c0ee989d 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -235,7 +235,7 @@ config REGULATOR_RC5T583
235 235
236config REGULATOR_S5M8767 236config REGULATOR_S5M8767
237 tristate "Samsung S5M8767A voltage regulator" 237 tristate "Samsung S5M8767A voltage regulator"
238 depends on MFD_S5M_CORE 238 depends on MFD_SEC_CORE
239 help 239 help
240 This driver supports a Samsung S5M8767A voltage output regulator 240 This driver supports a Samsung S5M8767A voltage output regulator
241 via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and 241 via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 9caadb482178..a77895889f3a 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -19,8 +19,8 @@
19#include <linux/platform_device.h> 19#include <linux/platform_device.h>
20#include <linux/regulator/driver.h> 20#include <linux/regulator/driver.h>
21#include <linux/regulator/machine.h> 21#include <linux/regulator/machine.h>
22#include <linux/mfd/s5m87xx/s5m-core.h> 22#include <linux/mfd/samsung/s5m-core.h>
23#include <linux/mfd/s5m87xx/s5m-pmic.h> 23#include <linux/mfd/samsung/s5m-pmic.h>
24 24
25struct s5m8767_info { 25struct s5m8767_info {
26 struct device *dev; 26 struct device *dev;