diff options
| author | Michael Brown <mcb30@ipxe.org> | 2013-07-09 16:01:52 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2013-07-13 12:44:48 +0200 |
| commit | 258195242b40526a4d2bc930cc425380f337918d (patch) | |
| tree | ff6cdd606c3db3618f5cf5b262630678a0c8626b /src/config/config.c | |
| parent | d8392851d2d5cfe0a7f79c2dab29219f59affa60 (diff) | |
| download | ipxe-258195242b40526a4d2bc930cc425380f337918d.tar.gz | |
[settings] Add config/settings.h
Move VMWARE_SETTINGS build configuration option from config/sideband.h
to a new config/settings.h.
Existing instances of config/local/sideband.h will not be affected,
since config.c still #includes config/sideband.h.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/config/config.c')
| -rw-r--r-- | src/config/config.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/config/config.c b/src/config/config.c index bd1d98856..15d57d1e7 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -10,6 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <config/general.h> #include <config/console.h> #include <config/sideband.h> +#include <config/settings.h> /** @file * @@ -293,9 +294,13 @@ REQUIRE_OBJECT ( tap ); REQUIRE_OBJECT ( efi_bofm ); #endif /* BOFM_EFI */ #endif /* CONFIG_BOFM */ + +/* + * Drag in relevant settings sources + */ #ifdef VMWARE_SETTINGS REQUIRE_OBJECT ( guestinfo ); -#endif /* VMWARE_SETTINGS */ +#endif /* * Drag in selected keyboard map |