diff --git a/[refs] b/[refs] index 8bf4a9297a5c..9c94e15ac848 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f18e9625e02bb3e5ba9e81104f14e9d904ab28c4 +refs/heads/master: 61cfc7e442c52c14e632d9af0e70779cfa04249d diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 113c74c07da4..44e9208f9c78 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -739,7 +739,8 @@ config VM_EVENT_COUNTERS config PCI_QUIRKS default y - bool "Enable PCI quirk workarounds" if EMBEDDED && PCI + bool "Enable PCI quirk workarounds" if EMBEDDED + depends on PCI help This enables workarounds for various PCI chipset bugs/quirks. Disable this only if your target machine is