tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

PCI: Fix PCI kconfig menu organization

After commit eb01d42a7778 ("PCI: consolidate PCI config entry in
drivers/pci"), all the PCI kconfig options appear below "PCI support"
rather than within a sub-menu. This is because menuconfig expects all
kconfig entries to be enclosed in an if/endif section. Add the missing
if/endif.

With this, "depends on PCI" is redundant in the sub-menu entries and can
be removed.

Fixes: eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci")
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

authored by

Rob Herring and committed by
Bjorn Helgaas 2e8cb2cf a3869d43

+8 -14
+8 -14
drivers/pci/Kconfig
··· 21 21 support for PCI-X and the foundations for PCI Express support. 22 22 Say 'Y' here unless you know what you are doing. 23 23 24 + if PCI 25 + 24 26 config PCI_DOMAINS 25 27 bool 26 28 depends on PCI 27 29 28 30 config PCI_DOMAINS_GENERIC 29 31 bool 30 - depends on PCI 31 32 select PCI_DOMAINS 32 33 33 34 config PCI_SYSCALL ··· 38 37 39 38 config PCI_MSI 40 39 bool "Message Signaled Interrupts (MSI and MSI-X)" 41 - depends on PCI 42 40 select GENERIC_MSI_IRQ 43 41 help 44 42 This allows device drivers to enable MSI (Message Signaled ··· 59 59 config PCI_QUIRKS 60 60 default y 61 61 bool "Enable PCI quirk workarounds" if EXPERT 62 - depends on PCI 63 62 help 64 63 This enables workarounds for various PCI chipset bugs/quirks. 65 64 Disable this only if your target machine is unaffected by PCI ··· 66 67 67 68 config PCI_DEBUG 68 69 bool "PCI Debugging" 69 - depends on PCI && DEBUG_KERNEL 70 + depends on DEBUG_KERNEL 70 71 help 71 72 Say Y here if you want the PCI core to produce a bunch of debug 72 73 messages to the system log. Select this if you are having a ··· 76 77 77 78 config PCI_REALLOC_ENABLE_AUTO 78 79 bool "Enable PCI resource re-allocation detection" 79 - depends on PCI 80 80 depends on PCI_IOV 81 81 help 82 82 Say Y here if you want the PCI core to detect if PCI resource ··· 88 90 89 91 config PCI_STUB 90 92 tristate "PCI Stub driver" 91 - depends on PCI 92 93 help 93 94 Say Y or M here if you want be able to reserve a PCI device 94 95 when it is going to be assigned to a guest operating system. ··· 96 99 97 100 config PCI_PF_STUB 98 101 tristate "PCI PF Stub driver" 99 - depends on PCI 100 102 depends on PCI_IOV 101 103 help 102 104 Say Y or M here if you want to enable support for devices that ··· 107 111 108 112 config XEN_PCIDEV_FRONTEND 109 113 tristate "Xen PCI Frontend" 110 - depends on PCI && X86 && XEN 114 + depends on X86 && XEN 111 115 select PCI_XEN 112 116 select XEN_XENBUS_FRONTEND 113 117 default y ··· 129 133 130 134 config PCI_IOV 131 135 bool "PCI IOV support" 132 - depends on PCI 133 136 select PCI_ATS 134 137 help 135 138 I/O Virtualization is a PCI feature supported by some devices ··· 139 144 140 145 config PCI_PRI 141 146 bool "PCI PRI support" 142 - depends on PCI 143 147 select PCI_ATS 144 148 help 145 149 PRI is the PCI Page Request Interface. It allows PCI devices that are ··· 148 154 149 155 config PCI_PASID 150 156 bool "PCI PASID support" 151 - depends on PCI 152 157 select PCI_ATS 153 158 help 154 159 Process Address Space Identifiers (PASIDs) can be used by PCI devices ··· 160 167 161 168 config PCI_P2PDMA 162 169 bool "PCI peer-to-peer transfer support" 163 - depends on PCI && ZONE_DEVICE 170 + depends on ZONE_DEVICE 164 171 select GENERIC_ALLOCATOR 165 172 help 166 173 Enableѕ drivers to do PCI peer-to-peer transactions to and from ··· 177 184 178 185 config PCI_LABEL 179 186 def_bool y if (DMI || ACPI) 180 - depends on PCI 181 187 select NLS 182 188 183 189 config PCI_HYPERV 184 190 tristate "Hyper-V PCI Frontend" 185 - depends on PCI && X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 191 + depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 186 192 help 187 193 The PCI device frontend driver allows the kernel to import arbitrary 188 194 PCI devices from a PCI backend to support PCI driver domains. ··· 190 198 source "drivers/pci/controller/Kconfig" 191 199 source "drivers/pci/endpoint/Kconfig" 192 200 source "drivers/pci/switch/Kconfig" 201 + 202 + endif