git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
Kconfig
diff --git
a/drivers/pci/Kconfig
b/drivers/pci/Kconfig
index c27e782e6df999de618dc5a96e6cfd2ec15f6939..5f1b9f58070e7cd55ace1d08f0c99a3ce4c9d1dc 100644
(file)
--- a/
drivers/pci/Kconfig
+++ b/
drivers/pci/Kconfig
@@
-19,7
+19,7
@@
config PCI_MSI
config PCI_MULTITHREAD_PROBE
bool "PCI Multi-threaded probe (EXPERIMENTAL)"
config PCI_MULTITHREAD_PROBE
bool "PCI Multi-threaded probe (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
+ depends on PCI && EXPERIMENTAL
&& BROKEN
help
Say Y here if you want the PCI core to spawn a new thread for
every PCI device that is probed. This can cause a huge
help
Say Y here if you want the PCI core to spawn a new thread for
every PCI device that is probed. This can cause a huge
@@
-52,3
+52,11
@@
config PCI_DEBUG
When in doubt, say N.
When in doubt, say N.
+config HT_IRQ
+ bool "Interrupts on hypertransport devices"
+ default y
+ depends on PCI && X86_LOCAL_APIC && X86_IO_APIC
+ help
+ This allows native hypertransport devices to use interrupts.
+
+ If unsure say Y.