diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 17:08:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 17:08:00 -0500 |
| commit | 5d66f151ac7cb5162f201fe2996c6e01f0323f37 (patch) | |
| tree | 76b1ee15cb999a436b394b70a207dd47c0140ad6 /drivers/pci/hotplug | |
| parent | 3131e530ac3faf09fb0878a9dc4cd6df0e35b6a3 (diff) | |
| parent | bd3989e006ed1c88d47c3308746ae0330fc1bcf4 (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 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 63d62752fb91..a64449d489d6 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig | |||
| @@ -41,7 +41,7 @@ config HOTPLUG_PCI_FAKE | |||
| 41 | 41 | ||
| 42 | config HOTPLUG_PCI_COMPAQ | 42 | config HOTPLUG_PCI_COMPAQ |
| 43 | tristate "Compaq PCI Hotplug driver" | 43 | tristate "Compaq PCI Hotplug driver" |
| 44 | depends on X86 && PCI_BIOS | 44 | depends on X86 && PCI_BIOS && PCI_LEGACY |
| 45 | help | 45 | help |
| 46 | Say Y here if you have a motherboard with a Compaq PCI Hotplug | 46 | Say Y here if you have a motherboard with a Compaq PCI Hotplug |
| 47 | controller. | 47 | controller. |
| @@ -63,7 +63,7 @@ config HOTPLUG_PCI_COMPAQ_NVRAM | |||
| 63 | 63 | ||
| 64 | config HOTPLUG_PCI_IBM | 64 | config HOTPLUG_PCI_IBM |
| 65 | tristate "IBM PCI Hotplug driver" | 65 | tristate "IBM PCI Hotplug driver" |
| 66 | depends on X86_IO_APIC && X86 && PCI_BIOS | 66 | depends on X86_IO_APIC && X86 && PCI_BIOS && PCI_LEGACY |
| 67 | help | 67 | help |
| 68 | Say Y here if you have a motherboard with a IBM PCI Hotplug | 68 | Say Y here if you have a motherboard with a IBM PCI Hotplug |
| 69 | controller. | 69 | controller. |
| @@ -119,7 +119,7 @@ config HOTPLUG_PCI_CPCI_ZT5550 | |||
| 119 | 119 | ||
| 120 | config HOTPLUG_PCI_CPCI_GENERIC | 120 | config HOTPLUG_PCI_CPCI_GENERIC |
| 121 | tristate "Generic port I/O CompactPCI Hotplug driver" | 121 | tristate "Generic port I/O CompactPCI Hotplug driver" |
| 122 | depends on HOTPLUG_PCI_CPCI && X86 | 122 | depends on HOTPLUG_PCI_CPCI && X86 && PCI_LEGACY |
| 123 | help | 123 | help |
| 124 | Say Y here if you have a CompactPCI system card that exposes the #ENUM | 124 | Say Y here if you have a CompactPCI system card that exposes the #ENUM |
| 125 | hotswap signal as a bit in a system register that can be read through | 125 | hotswap signal as a bit in a system register that can be read through |
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index 3ef0a4875a62..856d57b4d604 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c | |||
| @@ -1931,16 +1931,14 @@ void cpqhp_pushbutton_thread(unsigned long slot) | |||
| 1931 | return ; | 1931 | return ; |
| 1932 | } | 1932 | } |
| 1933 | 1933 | ||
| 1934 | if (func != NULL && ctrl != NULL) { | 1934 | if (cpqhp_process_SS(ctrl, func) != 0) { |
| 1935 | if (cpqhp_process_SS(ctrl, func) != 0) { | 1935 | amber_LED_on(ctrl, hp_slot); |
| 1936 | amber_LED_on (ctrl, hp_slot); | 1936 | green_LED_on(ctrl, hp_slot); |
| 1937 | green_LED_on (ctrl, hp_slot); | ||
| 1938 | |||
| 1939 | set_SOGO(ctrl); | ||
| 1940 | 1937 | ||
| 1941 | /* Wait for SOBS to be unset */ | 1938 | set_SOGO(ctrl); |
| 1942 | wait_for_ctrl_irq (ctrl); | 1939 | |
| 1943 | } | 1940 | /* Wait for SOBS to be unset */ |
| 1941 | wait_for_ctrl_irq(ctrl); | ||
| 1944 | } | 1942 | } |
| 1945 | 1943 | ||
| 1946 | p_slot->state = STATIC_STATE; | 1944 | p_slot->state = STATIC_STATE; |