[pci] Drag in PCI commands only when PCI support is present

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config.c b/src/config/config.c
index c32bcee88b90e391dcf633d33e6a181859f5ca13..187244b1444144d68df1f1e57d464400e877ec39 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -270,9 +270,6 @@ REQUIRE_OBJECT ( shell );
 #ifdef NSLOOKUP_CMD
 REQUIRE_OBJECT ( nslookup_cmd );
 #endif
-#ifdef PCI_CMD
-REQUIRE_OBJECT ( pci_cmd );
-#endif
 #ifdef PARAM_CMD
 REQUIRE_OBJECT ( param_cmd );
 #endif

diff --git a/src/config/config_pci.c b/src/config/config_pci.c
index c6c9b92a5fc34036f015bb2c55db9bc65ecbfccc..dc5073ef68db2d5336cac8d31a57305bc157192d 100644 (file)
--- a/src/config/config_pci.c
+++ b/src/config/config_pci.c
@@ -22,6 +22,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 FILE_SECBOOT ( PERMITTED );
 
+#include <config/general.h>
 #include <config/settings.h>
 #include <config/ioapi.h>
 
@@ -33,6 +34,9 @@ FILE_SECBOOT ( PERMITTED );
 
 PROVIDE_REQUIRING_SYMBOL();
 
+#ifdef PCI_CMD
+REQUIRE_OBJECT ( pci_cmd );
+#endif
 #ifdef PCI_SETTINGS
 REQUIRE_OBJECT ( pci_settings );
 #endif