diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:16:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:16:53 -0400 |
| commit | a3415dc34f4a615a904852e7a9d0cc2877007e9e (patch) | |
| tree | 0072b4b3f266c03220ffb2a9b329b2591f2a8e19 /init | |
| parent | b4d0b08a4c3947c6ac004c9d83154ec5999c1861 (diff) | |
| parent | 05a34f51ba451c65773ad6f1acf4cc089cc474d8 (diff) | |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (32 commits)
PCI hotplug: fix logic in Compaq hotplug controller bus speed setup
PCI: don't export linux/io.h from pci.h
PCI: PCI_QUIRKS depends on PCI
PCI hotplug: pciehp: poll data link layer link active
PCI hotplug: pciehp: fix possible memory leak in pcie_init
PCI: Workaround invalid P2P bridge bus numbers
PCI Hotplug: fakephp: add duplicate slot name debugging
PCI: Hotplug core: remove 'name'
PCI: shcphp: remove 'name' parameter
PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
PCI: rpaphp: kmalloc/kfree slot->name directly
PCI: pciehp: remove 'name' parameter
PCI: ibmphp: stop managing hotplug_slot->name
PCI: fakephp: remove 'name' parameter
PCI, PCI Hotplug: introduce slot_name helpers
PCI: cpqphp: stop managing hotplug_slot->name
PCI: cpci_hotplug: stop managing hotplug_slot->name
PCI: acpiphp: remove 'name' parameter
PCI: prevent duplicate slot names
PCI Hotplug: serialize pci_hp_register and pci_hp_deregister
...
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 113c74c07da4..44e9208f9c78 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -739,7 +739,8 @@ config VM_EVENT_COUNTERS | |||
| 739 | 739 | ||
| 740 | config PCI_QUIRKS | 740 | config PCI_QUIRKS |
| 741 | default y | 741 | default y |
| 742 | bool "Enable PCI quirk workarounds" if EMBEDDED && PCI | 742 | bool "Enable PCI quirk workarounds" if EMBEDDED |
| 743 | depends on PCI | ||
| 743 | help | 744 | help |
| 744 | This enables workarounds for various PCI chipset | 745 | This enables workarounds for various PCI chipset |
| 745 | bugs/quirks. Disable this only if your target machine is | 746 | bugs/quirks. Disable this only if your target machine is |