Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/if_bwfm_sdio.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/if_bwfm_sdio.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- src/sys/dev/sdmmc/if_bwfm_sdio.c	2020/07/22 17:22:43	1.22
+++ src/sys/dev/sdmmc/if_bwfm_sdio.c	2020/07/22 17:23:12	1.23
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.22 2020/07/22 17:22:43 riastradh Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.23 2020/07/22 17:23:12 riastradh Exp $ */
 /* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
@@ -18,36 +18,36 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
 #include <sys/buf.h>
+#include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
+#include <sys/kmem.h>
 #include <sys/malloc.h>
-#include <sys/device.h>
+#include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/mutex.h>
-#include <sys/kmem.h>
+#include <sys/systm.h>
 
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_media.h>
 #include <net/if_ether.h>
+#include <net/if_media.h>
 
 #include <netinet/in.h>
 
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdtvar.h>
-
 #include <net80211/ieee80211_var.h>
 
-#include <dev/sdmmc/sdmmcdevs.h>
-#include <dev/sdmmc/sdmmcvar.h>
-
+#include <dev/fdt/fdtvar.h>
 #include <dev/ic/bwfmreg.h>
 #include <dev/ic/bwfmvar.h>
+#include <dev/ofw/openfirm.h>
 #include <dev/sdmmc/if_bwfm_sdio.h>
+#include <dev/sdmmc/sdmmcdevs.h>
+#include <dev/sdmmc/sdmmcvar.h>
 
 #ifdef BWFM_DEBUG
 #define DPRINTF(x)	do { if (bwfm_debug > 0) printf x; } while (0)