Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c4089e8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'ib-mfd-input-rtc-v4.14' of... 

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.
parents 95a0c7c2 0335a955

drivers/input/misc/dm355evm_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/mfd/dm355evm_msp.c

+1 −1
Original line number Diff line number Diff line
@@ -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>





/*

drivers/rtc/rtc-dm355evm.c

+1 −1
Original line number Diff line number Diff line
@@ -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>