video: tegra: Correct a Kconfig warning with VIDCONSOLE_AS_LCD

[u-boot] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f07567c81ac4374c46349cf892c5420179841369..49e173c820eda127cfea4eaf1d87f4a64d96ce8b 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -93,9 +93,6 @@ config SYS_X86_START16
        depends on X86_RESET_VECTOR
        default 0xfffff800
 
-config DM_PCI_COMPAT
-       default y       # Until we finish moving over to the new API
-
 config BOARD_ROMSIZE_KB_512
        bool
 config BOARD_ROMSIZE_KB_1024
@@ -358,6 +355,15 @@ config GENERATE_ACPI_TABLE
          by the operating system. It defines platform-independent interfaces
          for configuration and power management monitoring.
 
+config QEMU_ACPI_TABLE
+       bool "Load ACPI table from QEMU fw_cfg interface"
+       depends on GENERATE_ACPI_TABLE && QEMU
+       default y
+       help
+         By default, U-Boot generates its own ACPI tables. This option, if
+         enabled, disables U-Boot's version and loads ACPI tables generated
+         by QEMU.
+
 config GENERATE_SMBIOS_TABLE
        bool "Generate an SMBIOS (System Management BIOS) table"
        default y