From d678a59d2d719da9e807495b4b021501f2836ca5 Mon Sep 17 00:00:00 2001
From: Tom Rini
Date: Sat, 18 May 2024 20:20:43 -0600
Subject: Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay
 Ethernet""

When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.

This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.

Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 fs/zfs/dev.c          | 1 +
 fs/zfs/zfs.c          | 1 +
 fs/zfs/zfs_fletcher.c | 1 +
 fs/zfs/zfs_lzjb.c     | 1 +
 fs/zfs/zfs_sha256.c   | 1 +
 5 files changed, 5 insertions(+)

(limited to 'fs/zfs')

diff --git a/fs/zfs/dev.c b/fs/zfs/dev.c
index 722c6a86176..fcd9893b3ac 100644
--- a/fs/zfs/dev.c
+++ b/fs/zfs/dev.c
@@ -8,6 +8,7 @@
  */
 
 
+#include <common.h>
 #include <config.h>
 #include <fs_internal.h>
 #include <zfs_common.h>
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index c44e7ece5df..bfc11fa6676 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -10,6 +10,7 @@
  *	Copyright 2004	Sun Microsystems, Inc.
  */
 
+#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <linux/stat.h>
diff --git a/fs/zfs/zfs_fletcher.c b/fs/zfs/zfs_fletcher.c
index b06c335626a..008a303ec79 100644
--- a/fs/zfs/zfs_fletcher.c
+++ b/fs/zfs/zfs_fletcher.c
@@ -8,6 +8,7 @@
  * Use is subject to license terms.
  */
 
+#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c
index e79c5b4278f..b42d4980129 100644
--- a/fs/zfs/zfs_lzjb.c
+++ b/fs/zfs/zfs_lzjb.c
@@ -8,6 +8,7 @@
  * Use is subject to license terms.
  */
 
+#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
diff --git a/fs/zfs/zfs_sha256.c b/fs/zfs/zfs_sha256.c
index 602d75254ff..cb5b1c06834 100644
--- a/fs/zfs/zfs_sha256.c
+++ b/fs/zfs/zfs_sha256.c
@@ -8,6 +8,7 @@
  * Use is subject to license terms.
  */
 
+#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
-- 
cgit v1.2.3