diff options
author | 2018-08-12 08:55:01 +0200 | |
---|---|---|
committer | 2018-08-12 08:55:10 +0200 | |
commit | 73b383141d296c55bfbc0ce336a4a946627e7780 (patch) | |
tree | df0840c4ea4bbd5aa453931a594936bd9adab61d /drivers/pci/controller/dwc | |
parent | ALSA: dice: fix wrong copy to rx parameters for Alesis iO26 (diff) | |
parent | ALSA: usb-audio: Mark expected switch fall-through (diff) | |
download | wireguard-linux-73b383141d296c55bfbc0ce336a4a946627e7780.tar.xz wireguard-linux-73b383141d296c55bfbc0ce336a4a946627e7780.zip |
Merge branch 'for-next' into for-linus
Preparation for 4.19 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/pci/controller/dwc')
-rw-r--r-- | drivers/pci/controller/dwc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 16f52c626b4b..91b0194240a5 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -58,7 +58,6 @@ config PCIE_DW_PLAT_HOST depends on PCI && PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select PCIE_DW_PLAT - default y help Enables support for the PCIe controller in the Designware IP to work in host mode. There are two instances of PCIe controller in |