projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[cascardo/linux.git]
/
arch
/
x86
/
Kconfig
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index
8f2e665
..
3c74b54
100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-2435,8
+2435,6
@@
config PCI_CNB20LE_QUIRK
You should say N unless you know you need this.
You should say N unless you know you need this.
-source "drivers/pci/pcie/Kconfig"
-
source "drivers/pci/Kconfig"
# x86_64 have no ISA slots, but can have ISA-style DMA.
source "drivers/pci/Kconfig"
# x86_64 have no ISA slots, but can have ISA-style DMA.
@@
-2592,8
+2590,6
@@
config AMD_NB
source "drivers/pcmcia/Kconfig"
source "drivers/pcmcia/Kconfig"
-source "drivers/pci/hotplug/Kconfig"
-
config RAPIDIO
tristate "RapidIO support"
depends on PCI
config RAPIDIO
tristate "RapidIO support"
depends on PCI