summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-05-01 18:26:07 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2010-05-28 01:37:44 +0200
commit812f9e9d424dde9ccb35975c0281edb6f8543735 (patch)
tree6c86267a32459639801f6f169a953f691f6eaac7 /arch/arm
parentd88b25be3584138e53076ea3eea3d886c870470e (diff)
downloadlinux-812f9e9d424dde9ccb35975c0281edb6f8543735.tar.gz
mfd: Renamed ab3100.h to abx500.h
The goal here is to make way for a more general interface for the analog baseband chips ab3100 ab3550 ab550 and future chips. This patch have been divided into two parts since both changing name and content of a file is not recommended in git. Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-u300/i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c
index c73ed06b6065..d893ee035c23 100644
--- a/arch/arm/mach-u300/i2c.c
+++ b/arch/arm/mach-u300/i2c.c
@@ -9,7 +9,7 @@
*/
#include <linux/kernel.h>
#include <linux/i2c.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
#include <linux/regulator/machine.h>
#include <linux/amba/bus.h>
#include <mach/irqs.h>