diff options
| author | Sangbeom Kim <sbkim73@samsung.com> | 2012-07-11 21:06:40 +0900 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-16 12:57:35 +0200 |
| commit | 66c9fbb9895499ff3aede96845968138a5bec8ab (patch) | |
| tree | 8c2ec903b0c7995e689a80712b8bf9539f4f1cf6 /drivers/regulator | |
| parent | 1faedca9c7bfd3055204b9d10017ce77ad03fc72 (diff) | |
| download | linux-stable-66c9fbb9895499ff3aede96845968138a5bec8ab.tar.gz linux-stable-66c9fbb9895499ff3aede96845968138a5bec8ab.tar.bz2 linux-stable-66c9fbb9895499ff3aede96845968138a5bec8ab.zip | |
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/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/regulator/s5m8767.c | 4 |
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 config REGULATOR_S5M8767 tristate "Samsung S5M8767A voltage regulator" - depends on MFD_S5M_CORE + depends on MFD_SEC_CORE help This driver supports a Samsung S5M8767A voltage output regulator 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 @@ #include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> -#include <linux/mfd/s5m87xx/s5m-core.h> -#include <linux/mfd/s5m87xx/s5m-pmic.h> +#include <linux/mfd/samsung/s5m-core.h> +#include <linux/mfd/samsung/s5m-pmic.h> struct s5m8767_info { struct device *dev; |