diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-11 12:56:15 +0100 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-23 10:22:20 +0200 |
commit | 687b81d083c082bc1e853032e3a2a54f8c251d27 (patch) | |
tree | 60ce91a6ecc84a8bfd1968772cd081c0afdce0f8 /sound/soc | |
parent | c1d15b68aab86f1f3b602fa65e7618c0065d46e6 (diff) | |
download | op-kernel-dev-687b81d083c082bc1e853032e3a2a54f8c251d27.zip op-kernel-dev-687b81d083c082bc1e853032e3a2a54f8c251d27.tar.gz |
i2c: move OF helpers into the core
I2C of helpers used to live in of_i2c.c but experience (from SPI) shows
that it is much cleaner to have this in the core. This also removes a
circular dependency between the helpers and the core, and so we can
finally register child nodes in the core instead of doing this manually
in each driver. So, fix the drivers and documentation, too.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/imx-wm8962.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 3f726e4..f2fbde9 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -13,7 +13,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h> -#include <linux/of_i2c.h> +#include <linux/i2c.h> #include <linux/clk.h> #include <sound/soc.h> diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 52a36a9..9fd7a65 100644 --- 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> |