aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-28 10:55:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-28 10:55:44 -0700
commit350bb4bebf5d80937eb41b39509779888bc8aa75 (patch)
treee4d53867511a508ec8363725fa0c976b1d554520
parent81250437a55044edf16d2cc484da4fb837489317 (diff)
parent5f12c5eca6e6b7aeb4b2028d579f614b4fe7a81f (diff)
downloadlinux-linaro-stable-350bb4bebf5d80937eb41b39509779888bc8aa75.tar.gz
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.c2
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 @@
#include <linux/i2c.h>
#include <linux/io.h>
#include <linux/dma-mapping.h>
+#include <linux/of_address.h>
#include <linux/of_device.h>
+#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <sysdev/fsl_soc.h>
#include <asm/cpm.h>