diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:41:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:41:15 -0700 |
| commit | 9c4089e87a80376071cbedc3f66a16ac028782c5 (patch) | |
| tree | 9d689bc4b86292680e7f9c9060237a1e3b43fcaf /drivers | |
| parent | 95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58 (diff) | |
| parent | 0335a9554b4d6acc2d17efe752bff54ce59b57eb (diff) | |
| download | linux-9c4089e87a80376071cbedc3f66a16ac028782c5.tar.bz2 | |
Merge tag 'ib-mfd-input-rtc-v4.14' of git://git.kernel.org/pub/scm/linux/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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/misc/dm355evm_keys.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/dm355evm_msp.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-dm355evm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c index bab256ef32b9..c803db64a376 100644 --- 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 index 86eca614507b..2a2756709f22 100644 --- 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 index f225cd873ff6..97d8259b9494 100644 --- 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> |