diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 22:29:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 22:29:33 -0500 |
commit | 215e871aaa3d94540121a3809d80d0c5e5686e4f (patch) | |
tree | 0ed6469c5ad04db8cfa0edb58c676d5155df20cd /arch/x86/Kconfig | |
parent | b6cf160c4b788a31f6a4017a469b956ca77febf4 (diff) | |
parent | fd7d1ced29e5beb88c9068801da7a362606d8273 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (64 commits)
PCI: make pci_bus a struct device
PCI: fix codingstyle issues in include/linux/pci.h
PCI: fix codingstyle issues in drivers/pci/pci.h
PCI: PCIE ASPM support
PCI: Fix fakephp deadlock
PCI: modify SB700 SATA MSI quirk
PCI: Run ACPI _OSC method on root bridges only
PCI ACPI: AER driver should only register PCIe devices with _OSC
PCI ACPI: Added a function to register _OSC with only PCIe devices.
PCI: constify function pointer tables
PCI: Convert drivers/pci/proc.c to use unlocked_ioctl
pciehp: block new requests from the device before power off
pciehp: workaround against Bad DLLP during power off
pciehp: wait for 1000ms before LED operation after power off
PCI: Remove pci_enable_device_bars() from documentation
PCI: Remove pci_enable_device_bars()
PCI: Remove users of pci_enable_device_bars()
PCI: Add pci_enable_device_{io,mem} intefaces
PCI: avoid save the same type of cap multiple times
PCI: correctly initialize a structure for pcie_save_pcix_state()
...
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 93e66678e158..bb07f87d8622 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1369,11 +1369,6 @@ config PCI | |||
1369 | your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or | 1369 | your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or |
1370 | VESA. If you have PCI, say Y, otherwise N. | 1370 | VESA. If you have PCI, say Y, otherwise N. |
1371 | 1371 | ||
1372 | The PCI-HOWTO, available from | ||
1373 | <http://www.tldp.org/docs.html#howto>, contains valuable | ||
1374 | information about which PCI hardware does work under Linux and which | ||
1375 | doesn't. | ||
1376 | |||
1377 | choice | 1372 | choice |
1378 | prompt "PCI access mode" | 1373 | prompt "PCI access mode" |
1379 | depends on X86_32 && PCI && !X86_VISWS | 1374 | depends on X86_32 && PCI && !X86_VISWS |