Merge tag 'ib-mfd-input-rtc-v4.14' of git://git.kernel.org/pub/scm/li…

…nux/kernel/git/lee/mfd into next Merge "Immutable branch between MFD, Input and RTC due for the v3.14 merge window" to have dm355evm_msp.h header moved into right place.
opendata26 · Sep 21, 2017 · 9c4089e · 9c4089e
2 parents 95a0c7c + 0335a95
commit 9c4089e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
@@ -18,7 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/i2c.h>
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 
 
 /*

diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
@@ -13,7 +13,7 @@
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 
-#include <linux/i2c/dm355evm_msp.h>
+#include <linux/mfd/dm355evm_msp.h>
 #include <linux/module.h>
 
 

diff --git a/include/linux/i2c/dm355evm_msp.h → include/linux/mfd/dm355evm_msp.h b/include/linux/i2c/dm355evm_msp.h → include/linux/mfd/dm355evm_msp.h