diff options
| -rw-r--r-- | sys/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/conf/options | 3 | ||||
| -rw-r--r-- | sys/geom/geom_mbr.c | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 2cada40400c4..26fe71fd7c5f 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -102,7 +102,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options GEOM # Use the GEOMetry system for # disk-I/O transformations. -options GEOM_GPT # Include support for GPT disks. # # The root device and filesystem type can be compiled in; diff --git a/sys/conf/files b/sys/conf/files index 30d1a1660456..76de69ed8e68 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -732,7 +732,7 @@ geom/geom_disk.c optional geom geom/geom_dump.c optional geom geom/geom_enc.c optional geom geom/geom_event.c optional geom -geom/geom_gpt.c optional geom geom_gpt +geom/geom_gpt.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom diff --git a/sys/conf/options b/sys/conf/options index f946987a7dda..2a51b43c3e40 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -63,8 +63,7 @@ ADW_ALLOW_MEMIO opt_adw.h # Allow PCI devices to use memory # Miscellaneous options. GEOM opt_geom.h -GEOM_GPT opt_geom.h # Add support for GUID Partition - # Tables (GPTs). + ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_SUNOS opt_compat.h diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 9e9fd7feea26..e00632c13396 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -58,9 +58,7 @@ #include <geom/geom.h> #include <geom/geom_slice.h> -#ifdef _KERNEL -#include "opt_geom.h" -#endif +#define GEOM_GPT #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" |