Merge

diff --cc arch/ia64/sn/kernel/irq.c
Simple merge

diff --cc drivers/pci/hotplug/Kconfig
index 30f1791e2ff6ba8205f4e39022913a7d911a98f4,2dd67d22e90697658b7645175f46ee7da99daab9..e707bb81fadedaeb4dd41dda78ad2214cb84a384
--- 1/drivers/pci/hotplug/Kconfig
--- 2/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@@ -122,95 -122,13 +122,103 @@@ config HOTPLUG_PCI_CPCI_GENERI
  
          When in doubt, say N.
  
 +config HOTPLUG_PCI_PCIE
 +      tristate "PCI Express Hotplug driver"
 +      depends on HOTPLUG_PCI
 +      help
 +        Say Y here if you have a motherboard that supports PCI Express Native
 +        Hotplug
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called pciehp.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_PCIE_POLL_EVENT_MODE
 +      bool "Use polling mechanism for hot-plug events."
 +      depends on HOTPLUG_PCI_PCIE
 +      help
 +        Say Y here if you want to use the polling mechanism for hot-plug 
 +        events.
 +         
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_PCIE_PHPRM_NONACPI
 +      bool "Non-ACPI: Use $HPRT for resource/configuration"
 +      depends on HOTPLUG_PCI_PCIE
 +      help
 +        Say Y here if Hotplug resource/configuration information is provided
 +        by platform BIOS $HPRT or bridge resource information, not by ACPI.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_SHPC
 +      tristate "SHPC PCI Hotplug driver"
 +      depends on HOTPLUG_PCI
 +      help
 +        Say Y here if you have a motherboard with a SHPC PCI Hotplug
 +        controller.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called shpchp.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
 +      bool "Use polling mechanism for hot-plug events"
 +      depends on HOTPLUG_PCI_SHPC
 +      help
 +        Say Y here if you want to use the polling mechanism for hot-plug 
 +        events.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_SHPC_PHPRM_NONACPI
 +      bool "Non-ACPI: Use $HPRT for resource/configuration"
 +      depends on HOTPLUG_PCI_SHPC
 +      help
 +        Say Y here if Hotplug resource/configuration information is provided
 +        by platform BIOS $HPRT or bridge resource information, not by ACPI.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_SHPC_PHPRM_LEGACY
 +      bool "For AMD SHPC only: Use $HRT for resource/configuration"
 +      depends on HOTPLUG_PCI_SHPC && HOTPLUG_PCI_SHPC_PHPRM_NONACPI
 +      help
 +        Say Y here for AMD SHPC. You have to select this option if you are 
 +        using this driver on AMD platform with SHPC.
 +
 +config HOTPLUG_PCI_RPA
 +      tristate "RPA PCI Hotplug driver"
 +      depends on HOTPLUG_PCI && PPC_PSERIES && PPC64
 +      help
 +        Say Y here if you have a a RPA system that supports PCI Hotplug.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called rpaphp.
 +
 +        When in doubt, say N.
 +
 +config HOTPLUG_PCI_RPA_DLPAR
 +      tristate "RPA Dynamic Logical Partitioning for I/O slots"
 +      depends on HOTPLUG_PCI_RPA
 +      help
 +        Say Y here if your system supports Dynamic Logical Partitioning
 +        for I/O slots.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called rpadlpar_io.
 + 
 +        When in doubt, say N.
 +
+ config HOTPLUG_PCI_SGI
+       tristate "SGI PCI Hotplug Support"
+       depends on HOTPLUG_PCI && IA64_SGI_SN2
+       help
+         Say Y here if you have an SGI IA64 Altix system.
+ 
+         When in doubt, say N.
+ 
  endmenu