diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/pci/Kconfig | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/pci/Kconfig')
| -rw-r--r-- | drivers/pci/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index e1ca42591ac4..2a4501dd2515 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig | |||
| @@ -42,6 +42,15 @@ config PCI_DEBUG | |||
| 42 | 42 | ||
| 43 | When in doubt, say N. | 43 | When in doubt, say N. |
| 44 | 44 | ||
| 45 | config PCI_STUB | ||
| 46 | tristate "PCI Stub driver" | ||
| 47 | depends on PCI | ||
| 48 | help | ||
| 49 | Say Y or M here if you want be able to reserve a PCI device | ||
| 50 | when it is going to be assigned to a guest operating system. | ||
| 51 | |||
| 52 | When in doubt, say N. | ||
| 53 | |||
| 45 | config HT_IRQ | 54 | config HT_IRQ |
| 46 | bool "Interrupts on hypertransport devices" | 55 | bool "Interrupts on hypertransport devices" |
| 47 | default y | 56 | default y |