diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:37:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:37:45 -0500 |
| commit | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (patch) | |
| tree | b573020e4d30ecdf69b22fcd1ced3dbb0e024ed3 /drivers/pci | |
| parent | fdba0f2da4b1db682b829b76302b2f25c376051c (diff) | |
| parent | 784020fb950741cbb7390c6b622321da626fb1e8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Add PCI MSI support on Niagara.
[SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
[SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
[PARTITION]: Add whole_disk attribute.
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 3cfb0a3575e6..5ea5bc70cb82 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | config PCI_MSI | 4 | config PCI_MSI |
| 5 | bool "Message Signaled Interrupts (MSI and MSI-X)" | 5 | bool "Message Signaled Interrupts (MSI and MSI-X)" |
| 6 | depends on PCI | 6 | depends on PCI |
| 7 | depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 | 7 | depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64 || SPARC64 |
| 8 | help | 8 | help |
| 9 | This allows device drivers to enable MSI (Message Signaled | 9 | This allows device drivers to enable MSI (Message Signaled |
| 10 | Interrupts). Message Signaled Interrupts enable a device to | 10 | Interrupts). Message Signaled Interrupts enable a device to |