[v1] linux-next: build failure after merge of the iio tree

linux-next: build failure after merge of the iio tree

Stephen Rothwell posted 1 patch 1 month, 2 weeks ago

Diff against v1
Download mbox

There is a newer version of this series

drivers/iio/proximity/vl53l0x-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

linux-next: build failure after merge of the iio tree

Posted by Stephen Rothwell 1 month, 2 weeks ago

Hi all,

After merging the iio tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/iio/proximity/vl53l0x-i2c.c:30:10: fatal error: asm/unaligned.h: No such file or directory
   30 | #include <asm/unaligned.h>
      |          ^~~~~~~~~~~~~~~~~

Caused by commit

  762186c6e7b1 ("iio: proximity: vl53l0x-i2c: Added continuous mode support")

interatcing with commit

  5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")

from Linus' tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Oct 2024 15:31:23 +1100
Subject: [PATCH] fix up for "iio: proximity: vl53l0x-i2c: Added continuous
 mode support"

interacting with commit

  5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iio/proximity/vl53l0x-i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c
index 5a137859c2b6..bd076b2c9d95 100644
--- a/drivers/iio/proximity/vl53l0x-i2c.c
+++ b/drivers/iio/proximity/vl53l0x-i2c.c
@@ -27,7 +27,7 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
 
 #define VL_REG_SYSRANGE_START				0x00
 
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell