| Message ID | 1395177024-5178-1-git-send-email-scottwood@freescale.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Mar 18, 2014 at 04:10:24PM -0500, Scott Wood wrote: > Fixes a build break due to the undeclared use of irq_of_parse_and_map() > and of_iomap(). This build break was apparently introduced while the > driver was unbuildable due to the bug fixed by > 62c19c9d29e65086e5ae76df371ed2e6b23f00cd ("i2c: Remove usage of > orphaned symbol OF_I2C"). When 62c19c was added in v3.14-rc7, > the driver was enabled again, breaking the powerpc mpc85xx_defconfig > and mpc85xx_smp_defconfig. > > 62c19c is marked for stable, so this should go there as well. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Richard Weinberger <richard@nod.at> > Cc: stable@kernel.org Applied to for-current, thanks!
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>
Fixes a build break due to the undeclared use of irq_of_parse_and_map() and of_iomap(). This build break was apparently introduced while the driver was unbuildable due to the bug fixed by 62c19c9d29e65086e5ae76df371ed2e6b23f00cd ("i2c: Remove usage of orphaned symbol OF_I2C"). When 62c19c was added in v3.14-rc7, the driver was enabled again, breaking the powerpc mpc85xx_defconfig and mpc85xx_smp_defconfig. 62c19c is marked for stable, so this should go there as well. Signed-off-by: Scott Wood <scottwood@freescale.com> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Richard Weinberger <richard@nod.at> Cc: stable@kernel.org --- There are still warnings in this driver that suggest it is broken with CONFIG_PHYS_64BIT, but that part does not appear to be a regression. drivers/i2c/busses/i2c-cpm.c | 2 ++ 1 file changed, 2 insertions(+)