change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/fs/jfs/jfs_incore.h
..
..
@@ -1,20 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  *   Copyright (C) International Business Machines Corp., 2000-2004
3
4
  *   Portions Copyright (C) Christoph Hellwig, 2001-2002
4
- *
5
- *   This program is free software;  you can redistribute it and/or modify
6
- *   it under the terms of the GNU General Public License as published by
7
- *   the Free Software Foundation; either version 2 of the License, or
8
- *   (at your option) any later version.
9
- *
10
- *   This program is distributed in the hope that it will be useful,
11
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
12
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
13
- *   the GNU General Public License for more details.
14
- *
15
- *   You should have received a copy of the GNU General Public License
16
- *   along with this program;  if not, write to the Free Software
17
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
5
  */
19
6
 #ifndef _H_JFS_INCORE
20
7
 #define _H_JFS_INCORE
..
..
@@ -23,6 +10,8 @@
23
10
 #include <linux/rwsem.h>
24
11
 #include <linux/slab.h>
25
12
 #include <linux/bitops.h>
13
+#include <linux/uuid.h>
14
+
26
15
 #include "jfs_types.h"
27
16
 #include "jfs_xtree.h"
28
17
 #include "jfs_dtree.h"
..
..
@@ -178,8 +167,8 @@
178
167
 	pxd_t		logpxd;		/* pxd describing log	*/
179
168
 	pxd_t		fsckpxd;	/* pxd describing fsck wkspc */
180
169
 	pxd_t		ait2;		/* pxd describing AIT copy	*/
181
-	char		uuid[16];	/* 128-bit uuid for volume	*/
182
-	char		loguuid[16];	/* 128-bit uuid for log	*/
170
+	uuid_t		uuid;		/* 128-bit uuid for volume	*/
171
+	uuid_t		loguuid;	/* 128-bit uuid for log	*/
183
172
 	/*
184
173
 	 * commit_state is used for synchronization of the jfs_commit
185
174
 	 * threads.  It is protected by LAZY_LOCK().