git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
codecs
/
twl4030.c
diff --git
a/sound/soc/codecs/twl4030.c
b/sound/soc/codecs/twl4030.c
index d439c4c6fe50a9def802a3ad86419c0900527c17..c482b2e7a7d2a55d7ead20e56a680da6c0791378 100644
(file)
--- a/
sound/soc/codecs/twl4030.c
+++ b/
sound/soc/codecs/twl4030.c
@@
-28,7
+28,7
@@
#include <linux/platform_device.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
-#include <linux/
i2c
/twl.h>
+#include <linux/
mfd
/twl.h>
#include <linux/slab.h>
#include <linux/gpio.h>
#include <sound/core.h>