projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[linux-2.6-block.git]
/
sound
/
soc
/
fsl
/
imx-wm8962.c
diff --git
a/sound/soc/fsl/imx-wm8962.c
b/sound/soc/fsl/imx-wm8962.c
index 1d70e278e9154e7f21d1ba230b4f573ad5b31f95..722afe69169e904798974115292159a89a08ba18 100644
(file)
--- a/
sound/soc/fsl/imx-wm8962.c
+++ b/
sound/soc/fsl/imx-wm8962.c
@@
-15,7
+15,7
@@
#include <linux/module.h>
#include <linux/of_platform.h>
-#include <linux/
of_
i2c.h>
+#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/clk.h>
#include <sound/soc.h>