Commit 08f129d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Added new IBM PCI Hotplug controller driver.

Written by Irene Zubarev, Tong Yu, Jyoti Shah, Chuck Cole, and me.
parent 2d28f76f
...@@ -29,3 +29,14 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM ...@@ -29,3 +29,14 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
When in doubt, say N. When in doubt, say N.
CONFIG_HOTPLUG_PCI_IBM
Say Y here if you have a motherboard with a IBM PCI Hotplug
controller.
This code is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called cpqphp.o. If you want to compile it
as a module, say M here and read <file:Documentation/modules.txt>.
When in doubt, say N.
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
mainmenu_option next_comment mainmenu_option next_comment
comment 'PCI Hotplug Support' comment 'PCI Hotplug Support'
dep_tristate 'Support for PCI Hotplug (EXPERIMENTAL)' CONFIG_HOTPLUG_PCI $CONFIG_DDFS $CONFIG_EXPERIMENTAL dep_tristate 'Support for PCI Hotplug (EXPERIMENTAL)' CONFIG_HOTPLUG_PCI $CONFIG_PCI $CONFIG_EXPERIMENTAL
dep_tristate ' Compaq PCI Hotplug driver' CONFIG_HOTPLUG_PCI_COMPAQ $CONFIG_HOTPLUG_PCI dep_tristate ' Compaq PCI Hotplug driver' CONFIG_HOTPLUG_PCI_COMPAQ $CONFIG_HOTPLUG_PCI $CONFIG_X86
dep_mbool ' Save configuration into NVRAM on Compaq servers' CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM $CONFIG_HOTPLUG_PCI_COMPAQ dep_mbool ' Save configuration into NVRAM on Compaq servers' CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM $CONFIG_HOTPLUG_PCI_COMPAQ
dep_tristate ' IBM PCI Hotplug driver' CONFIG_HOTPLUG_PCI_IBM $CONFIG_HOTPLUG_PCI $CONFIG_X86_IO_APIC $CONFIG_X86
endmenu endmenu
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
O_TARGET := vmlinux-obj.o O_TARGET := vmlinux-obj.o
list-multi := cpqphp.o pci_hotplug.o list-multi := cpqphp.o pci_hotplug.o ibmphp.o
export-objs := pci_hotplug_core.o pci_hotplug_util.o export-objs := pci_hotplug_core.o pci_hotplug_util.o
obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o
obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o
obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o
pci_hotplug-objs := pci_hotplug_core.o \ pci_hotplug-objs := pci_hotplug_core.o \
pci_hotplug_util.o pci_hotplug_util.o
...@@ -19,6 +20,12 @@ cpqphp-objs := cpqphp_core.o \ ...@@ -19,6 +20,12 @@ cpqphp-objs := cpqphp_core.o \
cpqphp_proc.o \ cpqphp_proc.o \
cpqphp_pci.o cpqphp_pci.o
ibmphp-objs := ibmphp_core.o \
ibmphp_ebda.o \
ibmphp_pci.o \
ibmphp_res.o \
ibmphp_hpc.o
ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y) ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y)
cpqphp-objs += cpqphp_nvram.o cpqphp-objs += cpqphp_nvram.o
endif endif
...@@ -32,3 +39,6 @@ pci_hotplug.o: $(pci_hotplug-objs) ...@@ -32,3 +39,6 @@ pci_hotplug.o: $(pci_hotplug-objs)
cpqphp.o: $(cpqphp-objs) cpqphp.o: $(cpqphp-objs)
$(LD) -r -o $@ $(cpqphp-objs) $(LD) -r -o $@ $(cpqphp-objs)
ibmphp.o: $(ibmphp-objs)
$(LD) -r -o $@ $(ibmphp-objs)
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment