Merge tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c24xx / mach-osiris.c

diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index a6657e7204307272d0e6d36e7e594fbcab5fd5fb..ed3b22ceef06c75cbca69a8f2e5cef72183a3a47 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -24,7 +24,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
-#include <linux/i2c/tps65010.h>
+#include <linux/mfd/tps65010.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>