Merge branch '2023-03-27-rockchip-rk3399-fixes'

[J-u-boot.git] / fs / zfs / zfs.c

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index fb2b3ee089ecadb8c82cb35bc7912ffce9cbf65d..1fec96cd5ce5a67171d1c66e1b0974870704571d 100644 (file)
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * ZFS filesystem ported to u-boot by
@@ -7,11 +8,10 @@
  *     Copyright (C) 1999,2000,2001,2002,2003,2004
  *     Free Software Foundation, Inc.
  *     Copyright 2004  Sun Microsystems, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <log.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
@@ -20,7 +20,7 @@
 #include "zfs_common.h"
 #include "div64.h"
 
-block_dev_desc_t *zfs_dev_desc;
+struct blk_desc *zfs_dev_desc;
 
 /*
  * The zfs plug-in routines for GRUB are: