Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

350bb4be · Linus Torvalds <[email protected]> · 2014-03-28 10:55:44 -07:00

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

Commit: 350bb4bebf5d80937eb41b39509779888bc8aa75
Parents: 81250437 · 5f12c5ec

Merge commit. Changes below are compared with the first parent: 81250437.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
drivers/i2c/busses/i2c-cpm.c	modified	+2	−0	View file

drivers/i2c/busses/i2c-cpm.c

View file

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index be7f0a2..f3b89a4 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>