summaryrefslogtreecommitdiffstats
path: root/include/linux
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
parent1faedca9c7bfd3055204b9d10017ce77ad03fc72 (diff)
downloadop-kernel-dev-66c9fbb9895499ff3aede96845968138a5bec8ab.zip
op-kernel-dev-66c9fbb9895499ff3aede96845968138a5bec8ab.tar.gz
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')
-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 21603b4..7332ff6 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 7c719f2..7c719f2 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 6ce8da2..6ce8da2 100644
--- a/include/linux/mfd/s5m87xx/s5m-rtc.h
+++ b/include/linux/mfd/samsung/s5m-rtc.h
OpenPOWER on IntegriCloud