diff --git a/[refs] b/[refs]
index 4f2fb9192db1..2dc8b4c98f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d88b25be3584138e53076ea3eea3d886c870470e
+refs/heads/master: 812f9e9d424dde9ccb35975c0281edb6f8543735
diff --git a/trunk/arch/arm/mach-u300/i2c.c b/trunk/arch/arm/mach-u300/i2c.c
index c73ed06b6065..d893ee035c23 100644
--- a/trunk/arch/arm/mach-u300/i2c.c
+++ b/trunk/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>
diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c
index 16898211cd1a..f8c4a333ff1c 100644
--- a/trunk/drivers/mfd/ab3100-core.c
+++ b/trunk/drivers/mfd/ab3100-core.c
@@ -19,7 +19,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 
 /* These are the only registers inside AB3100 used in this main file */
 
diff --git a/trunk/drivers/mfd/ab3100-otp.c b/trunk/drivers/mfd/ab3100-otp.c
index 2d14655fdebd..7093f1aef1e5 100644
--- a/trunk/drivers/mfd/ab3100-otp.c
+++ b/trunk/drivers/mfd/ab3100-otp.c
@@ -12,7 +12,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
diff --git a/trunk/drivers/regulator/ab3100.c b/trunk/drivers/regulator/ab3100.c
index 1afd008ca957..04ca7f62c57e 100644
--- a/trunk/drivers/regulator/ab3100.c
+++ b/trunk/drivers/regulator/ab3100.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 
 /* LDO registers and some handy masking definitions for AB3100 */
 #define AB3100_LDO_A		0x40
diff --git a/trunk/drivers/rtc/rtc-ab3100.c b/trunk/drivers/rtc/rtc-ab3100.c
index 4704aac2b5af..b46b85d581b0 100644
--- a/trunk/drivers/rtc/rtc-ab3100.c
+++ b/trunk/drivers/rtc/rtc-ab3100.c
@@ -9,7 +9,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
-#include <linux/mfd/ab3100.h>
+#include <linux/mfd/abx500.h>
 
 /* Clock rate in Hz */
 #define AB3100_RTC_CLOCK_RATE	32768
diff --git a/trunk/include/linux/mfd/ab3100.h b/trunk/include/linux/mfd/abx500.h
similarity index 100%
rename from trunk/include/linux/mfd/ab3100.h
rename to trunk/include/linux/mfd/abx500.h