Merge tag 'rpmsg-v4.14' of git://github.com/andersson/remoteproc

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / common.h

diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 8cc6338fcb1288022854d7bb3347b9e000139c76..b5ad7fcb80ed24e06e1a84528bdbe4960b77c64b 100644 (file)
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -29,7 +29,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c/twl.h>
+#include <linux/mfd/twl.h>
 #include <linux/i2c-omap.h>
 #include <linux/reboot.h>
 #include <linux/irqchip/irq-omap-intc.h>