git: 0e3b0045a895 - main - sys/disk.h: Transition period for sys/conf.h over

From: Warner Losh <imp_at_FreeBSD.org>
Date: Fri, 04 Nov 2022 21:41:52 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=0e3b0045a8954300e55e7687ffd21a58e11f4529

commit 0e3b0045a8954300e55e7687ffd21a58e11f4529
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-11-04 21:39:05 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-04 21:40:12 +0000

    sys/disk.h: Transition period for sys/conf.h over
    
    There's no need to ever include sys/conf.h here anymore, so remove
    it. It was added years ago as a transition and everything has been
    updated.
    
    Sponsored by:           Netflix
---
 sys/sys/disk.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 8edcbe97a8f0..f4c33a783c73 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -23,10 +23,6 @@
 
 #ifdef _KERNEL
 
-#ifndef _SYS_CONF_H_
-#include <sys/conf.h>	/* XXX: temporary to avoid breakage */
-#endif
-
 void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
 
 #endif