diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-28 13:55:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-28 13:55:44 -0400 |
| commit | 350bb4bebf5d80937eb41b39509779888bc8aa75 (patch) | |
| tree | e4d53867511a508ec8363725fa0c976b1d554520 | |
| parent | 81250437a55044edf16d2cc484da4fb837489317 (diff) | |
| parent | 5f12c5eca6e6b7aeb4b2028d579f614b4fe7a81f (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c build fix from Wolfram Sang:
"The build fix from my last request unveiled another build problem
which is fixed with this patch"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: cpm: Fix build by adding of_address.h and of_irq.h
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index be7f0a20d634..f3b89a4698b6 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
| @@ -39,7 +39,9 @@ | |||
| 39 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
| 40 | #include <linux/io.h> | 40 | #include <linux/io.h> |
| 41 | #include <linux/dma-mapping.h> | 41 | #include <linux/dma-mapping.h> |
| 42 | #include <linux/of_address.h> | ||
| 42 | #include <linux/of_device.h> | 43 | #include <linux/of_device.h> |
| 44 | #include <linux/of_irq.h> | ||
| 43 | #include <linux/of_platform.h> | 45 | #include <linux/of_platform.h> |
| 44 | #include <sysdev/fsl_soc.h> | 46 | #include <sysdev/fsl_soc.h> |
| 45 | #include <asm/cpm.h> | 47 | #include <asm/cpm.h> |