Subject: [BK PATCH] PCI fixes for 2.6.0-test1
From: Greg KH <[email-masked]>
To: [email-masked]
Cc: [email-masked]

Hi,

Here's some PCI fixes that are against the latest 2.6.0-test1 bk tree.
They fix a few compile errors that people have reported with the PCI
core, and fix up the CPCI hotplug driver to work properly now.

Please pull from:
	bk://kernel.bkbits.net/gregkh/linux/pci-2.5

thanks,

greg k-h

p.s. I'll send these as patches in response to this email to lkml for
those who want to see them.

 arch/i386/pci/legacy.c                  |    2 +-
 drivers/pci/hotplug.c                   |    2 +-
 drivers/pci/hotplug/Kconfig             |   11 +++--------
 drivers/pci/hotplug/acpiphp_glue.c      |    4 ++--
 drivers/pci/hotplug/acpiphp_pci.c       |    4 ++--
 drivers/pci/hotplug/cpci_hotplug.h      |    1 -
 drivers/pci/hotplug/cpci_hotplug_core.c |   29 -----------------------------
 drivers/pci/hotplug/cpci_hotplug_pci.c  |   32 ++++++++++++++++++++++----------
 drivers/pci/pci.c                       |   10 +++++-----
 drivers/pci/pool.c                      |    8 ++++----
 drivers/pci/quirks.c                    |    8 ++++----
 drivers/pci/setup-bus.c                 |    6 +++---
 drivers/pci/setup-res.c                 |    8 ++++----
 include/linux/pci.h                     |    2 --
 14 files changed, 51 insertions(+), 76 deletions(-)
-----

<nkiesel:tbdnetworks.com>:
  o PCI: fixup for compile error in pci/legacy.c

<scottm:minion.yyz.somanetworks.com>:
  o [CPCI] Minimal fixes to restore CPCI hotplug to working order
  o [CPCI] Kconfig tweak
  o [CPCI] Fix potential deadlock on extract found by Rusty Lynch

Greg Kroah-Hartman:
  o PCI: remove usages of pci slot_name from acpi pci hotplug driver
  o PCI: remove usages of pci slot_name from the pci core code
  o PCI: fix up error for when CONFIG_PCI=n and scsi.h is included