Skip to contentSkip to conversation

i2c: icy: Fix build with CONFIG_AMIGA_PCMCIA=n

PATCH Applied Max Staudt 3 participants 3 messages Jun 7, 2020 – Jun 13, 2020

Subsystems (2)
lore
Share & tools
lore

Max Staudt

author maintainer
#0 lore raw

PATCH 1/1 i2c: icy: Fix build with CONFIG_AMIGA_PCMCIA=n

This has been found by the Kernel Test Robot:
http://lkml.iu.edu/hypermail/linux/kernel/2006.0/06862.html

With CONFIG_AMIGA_PCMCIA=n, io_mm.h does not pull in amigahw.h and ZTWO_VADDR is undefined. Add forgotten include to i2c-icy.c

Fixes 4768e90ecaec ("i2c: Add i2c-icy for I2C on m68k/Amiga")
---
 drivers/i2c/busses/i2c-icy.c | 1 +
 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-icy.c +1 -0
index 271470f4d..66c9923fc 100644
@@ -43,6 +43,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pcf.h>
 
+#include <asm/amigahw.h>
 #include <asm/amigaints.h>
 #include <linux/zorro.h>
 
Signature · 1 line
2.20.1
Applied
#1 lore raw
Quoted 9 lines · Max Staudt

This has been found by the Kernel Test Robot:
http://lkml.iu.edu/hypermail/linux/kernel/2006.0/06862.html

With CONFIG_AMIGA_PCMCIA=n, io_mm.h does not pull in amigahw.h and ZTWO_VADDR is undefined. Add forgotten include to i2c-icy.c

Fixes 4768e90ecaec ("i2c: Add i2c-icy for I2C on m68k/Amiga")

Applied to for-next (i.e. for-5.8), thanks!

#2 lore raw
Quoted 3 lines · Wolfram Sang

On Sun, Jun 07, 2020 at 08:28:12PM +0200, Max Staudt wrote:

Applied to for-next (i.e. for-5.8), thanks!

A bit of offtopic, merge window is at its end, do you have plans to send PR to Linus soon?

Signature · 2 lines
With Best Regards,
Andy Shevchenko