Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
  [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev
  [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands
  [SCSI] scsi_transport_iscsi: Fix documentation os parameter
  [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support
  [SCSI] libfc: improve flogi retries to avoid lport stuck
  [SCSI] libfc: avoid exchanges collision during lport reset
  [SCSI] libfc: fix checking FC_TYPE_BLS
  [SCSI] edd: Treat "XPRS" host bus type the same as "PCI"
  [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
  [SCSI] isci: revert bcn filtering
  [SCSI] isci: Fix hard reset timeout conditions.
  [SCSI] isci: No need to manage the pending reset bit on pending requests.
  [SCSI] isci: Remove redundant isci_request.ttype field.
  [SCSI] isci: Fix task management for SMP, SATA and on dev remove.
  [SCSI] isci: No task_done callbacks in error handler paths.
  [SCSI] isci: Handle task request timeouts correctly.
  [SCSI] isci: Fix tag leak in tasks and terminated requests.
  [SCSI] isci: Immediately fail I/O to removed devices.
  [SCSI] isci: Lookup device references through requests in completions.
  [SCSI] ipr: add definitions for additional adapter
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index f1b7f659d3c9..e22957665808 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -151,7 +151,8 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
                 p += scnprintf(p, left, "\tbase_address: %x\n",
                              info->params.interface_path.isa.base_address);
         } else if (!strncmp(info->params.host_bus_type, "PCIX", 4) ||
-                   !strncmp(info->params.host_bus_type, "PCI", 3)) {
+                   !strncmp(info->params.host_bus_type, "PCI", 3) ||
+                   !strncmp(info->params.host_bus_type, "XPRS", 4)) {
                 p += scnprintf(p, left,
                              "\t%02x:%02x.%d  channel: %u\n",
                              info->params.interface_path.pci.bus,
@@ -159,7 +160,6 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
                              info->params.interface_path.pci.function,
                              info->params.interface_path.pci.channel);
         } else if (!strncmp(info->params.host_bus_type, "IBND", 4) ||
-                   !strncmp(info->params.host_bus_type, "XPRS", 4) ||
                    !strncmp(info->params.host_bus_type, "HTPT", 4)) {
                 p += scnprintf(p, left,
                              "\tTBD: %llx\n",
@@ -668,7 +668,7 @@ edd_get_pci_dev(struct edd_device *edev)
 {
         struct edd_info *info = edd_dev_get_info(edev);
 
-        if (edd_dev_is_type(edev, "PCI")) {
+        if (edd_dev_is_type(edev, "PCI") || edd_dev_is_type(edev, "XPRS")) {
                 return pci_get_bus_and_slot(info->params.interface_path.pci.bus,
                                      PCI_DEVFN(info->params.interface_path.pci.slot,
                                                info->params.interface_path.pci.