aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2012-07-11 21:06:40 +0900
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-16 12:57:35 +0200
commit66c9fbb9895499ff3aede96845968138a5bec8ab (patch)
tree8c2ec903b0c7995e689a80712b8bf9539f4f1cf6 /include/linux/mfd
parentmfd: Add even more arizona register definitions (diff)
downloadlinux-dev-66c9fbb9895499ff3aede96845968138a5bec8ab.tar.xz
linux-dev-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 'include/linux/mfd')
-rw-r--r--include/linux/mfd/samsung/s5m-core.h (renamed from include/linux/mfd/s5m87xx/s5m-core.h)2
-rw-r--r--include/linux/mfd/samsung/s5m-pmic.h (renamed from include/linux/mfd/s5m87xx/s5m-pmic.h)0
-rw-r--r--include/linux/mfd/samsung/s5m-rtc.h (renamed from include/linux/mfd/s5m87xx/s5m-rtc.h)0
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/s5m87xx/s5m-core.h b/include/linux/mfd/samsung/s5m-core.h
index 21603b42f22f..7332ff608c85 100644
--- a/include/linux/mfd/s5m87xx/s5m-core.h
+++ b/include/linux/mfd/samsung/s5m-core.h
@@ -340,7 +340,7 @@ struct s5m_platform_data {
int num_regulators;
int irq_base;
- int (*cfg_pmic_irq)(void);
+ int (*cfg_pmic_irq)(void);
int ono;
bool wakeup;
diff --git a/include/linux/mfd/s5m87xx/s5m-pmic.h b/include/linux/mfd/samsung/s5m-pmic.h
index 7c719f20f58a..7c719f20f58a 100644
--- a/include/linux/mfd/s5m87xx/s5m-pmic.h
+++ b/include/linux/mfd/samsung/s5m-pmic.h
diff --git a/include/linux/mfd/s5m87xx/s5m-rtc.h b/include/linux/mfd/samsung/s5m-rtc.h
index 6ce8da264cec..6ce8da264cec 100644
--- a/include/linux/mfd/s5m87xx/s5m-rtc.h
+++ b/include/linux/mfd/samsung/s5m-rtc.h