Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 350bb4be authored Mar 28, 2014 by Linus Torvalds

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

parents 81250437 5f12c5ec

drivers/i2c/busses/i2c-cpm.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,9 @@
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
			#include <linux/of_address.h>
	#include <linux/of_device.h>		#include <linux/of_device.h>
			#include <linux/of_irq.h>
	#include <linux/of_platform.h>		#include <linux/of_platform.h>
	#include <sysdev/fsl_soc.h>		#include <sysdev/fsl_soc.h>
	#include <asm/cpm.h>		#include <asm/cpm.h>