summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-06-08 14:20:03 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-07-22 15:46:56 +0200
commit960e46416eaa90ea38b250eb74746a76ba97c5f4 (patch)
treee7ffc5883cba117ad085dbc4c97566b4e17f56cb /drivers
parent1fcd50ba1d13e7b04a78fe9e9cebf3fdfd5b908a (diff)
mfd: abx500: Move ab5500 include
Move the content of linux/mfd/abx500/ab5500.h to the mainline header linux/mfd/abx500.h Also change the clients of this file. ST-Ericsson Linux next: OK ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I30f7e2978d7bb00408597fdbdce8e7b6fdca397f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24725 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/leds-ab5500.c1
-rwxr-xr-xdrivers/mfd/ab5500-core.c1
-rw-r--r--drivers/mfd/ab5500-power.c1
-rw-r--r--drivers/regulator/ab5500.c1
-rw-r--r--drivers/rtc/rtc-ab.c1
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/leds/leds-ab5500.c b/drivers/leds/leds-ab5500.c
index 94db3a6feea..e4376d1b59b 100644
--- a/drivers/leds/leds-ab5500.c
+++ b/drivers/leds/leds-ab5500.c
@@ -14,7 +14,6 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/leds-ab5500.h>
#include <linux/types.h>
diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c
index 6f850853ce7..d471db6c406 100755
--- a/drivers/mfd/ab5500-core.c
+++ b/drivers/mfd/ab5500-core.c
@@ -22,7 +22,6 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/mfd/abx500.h>
#include <linux/list.h>
#include <linux/bitops.h>
diff --git a/drivers/mfd/ab5500-power.c b/drivers/mfd/ab5500-power.c
index 5bf6a4c5e97..46c2ae8c321 100644
--- a/drivers/mfd/ab5500-power.c
+++ b/drivers/mfd/ab5500-power.c
@@ -10,7 +10,6 @@
#include <linux/platform_device.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
static struct device *dev;
diff --git a/drivers/regulator/ab5500.c b/drivers/regulator/ab5500.c
index e8128e4caf8..f01444ff42f 100644
--- a/drivers/regulator/ab5500.c
+++ b/drivers/regulator/ab5500.c
@@ -16,7 +16,6 @@
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/regulator/ab5500.h>
#define AB5500_LDO_VDIGMIC_ST 0x50
diff --git a/drivers/rtc/rtc-ab.c b/drivers/rtc/rtc-ab.c
index db1992632fa..8e595e05d99 100644
--- a/drivers/rtc/rtc-ab.c
+++ b/drivers/rtc/rtc-ab.c
@@ -13,7 +13,6 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#define AB5500_RTC_CLOCK_RATE 32768
#define AB5500_RTC 0x00