summaryrefslogtreecommitdiff
path: root/include/asm-h8300/ide.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 14:08:00 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 14:08:00 -0800
commit5d66f151ac7cb5162f201fe2996c6e01f0323f37 (patch)
tree76b1ee15cb999a436b394b70a207dd47c0140ad6 /include/asm-h8300/ide.h
parent3131e530ac3faf09fb0878a9dc4cd6df0e35b6a3 (diff)
parentbd3989e006ed1c88d47c3308746ae0330fc1bcf4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Add Kconfig option to disable deprecated pci_find_* API PCI: pciserial_resume_one ignored return value of pci_enable_device PCI Hotplug: cpqhp_pushbutton_thread(): remove a pointless if() check PCI: make pci_match_device() static PCI: Remove 3 incorrect MSI quirks. PCI: Add MSI INTX_DISABLE quirks for ATI SB700/800 SATA and IXP SB400 USB PCI: Add quirk for devices which disable MSI when INTX_DISABLE is set. PCI: Add MSI quirk for ServerWorks HT1000 PCIX bridge. PCI: Revert "PCI: disable MSI by default on systems with Serverworks HT1000 chips"
Diffstat (limited to 'include/asm-h8300/ide.h')
0 files changed, 0 insertions, 0 deletions