aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 21:54:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 21:54:53 -0500
commit02ebbbd481635fd3ce7018e5bb19c18c0f1e4561 (patch)
treef07caea3ac9cb50492977a2f7b1d29bbce6e6a3a /drivers/pci
parentaddd8c92cf55bba578b8a56e0f717a0a74b31008 (diff)
parent536ec4f8d13433126f948d6e90821f811a4ebdf8 (diff)
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scsi: drop unused Kconfig symbol pci: drop unused Kconfig symbol stmmac: drop unused Kconfig symbol x86: drop unused Kconfig symbol powerpc: drop unused Kconfig symbols powerpc: 40x: drop unused Kconfig symbol mips: drop unused Kconfig symbols openrisc: drop unused Kconfig symbols arm: at91: drop unused Kconfig symbol samples: drop unused Kconfig symbol m32r: drop unused Kconfig symbol score: drop unused Kconfig symbols sh: drop unused Kconfig symbol um: drop unused Kconfig symbol sparc: drop unused Kconfig symbol alpha: drop unused Kconfig symbol Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig as per Michal: the STMMAC_DUAL_MAC config variable is still unused and should be deleted.
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index cec66064ee4b..b6f9749b4fa7 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -51,17 +51,6 @@ config XEN_PCIDEV_FRONTEND
51 The PCI device frontend driver allows the kernel to import arbitrary 51 The PCI device frontend driver allows the kernel to import arbitrary
52 PCI devices from a PCI backend to support PCI driver domains. 52 PCI devices from a PCI backend to support PCI driver domains.
53 53
54config XEN_PCIDEV_FE_DEBUG
55 bool "Xen PCI Frontend debugging"
56 depends on XEN_PCIDEV_FRONTEND && PCI_DEBUG
57 help
58 Say Y here if you want the Xen PCI frontend to produce a bunch of debug
59 messages to the system log. Select this if you are having a
60 problem with Xen PCI frontend support and want to see more of what is
61 going on.
62
63 When in doubt, say N.
64
65config HT_IRQ 54config HT_IRQ
66 bool "Interrupts on hypertransport devices" 55 bool "Interrupts on hypertransport devices"
67 default y 56 default y