Merge remote-tracking branch 'pci/next'

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/scsi/gdth.c
index 5d72274c507ff7d271b607289dcced6e0f6c3138,5d72274c507ff7d271b607289dcced6e0f6c3138..5209e81e48f26e535ebd0efefc5addfeed0bd840
--- 1/drivers/scsi/gdth.c
--- 2/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@@ -1108,7 -1108,7 +1108,7 @@@ static int __devinit gdth_init_pci(stru
          command |= 6;
        pci_write_config_word(pdev, PCI_COMMAND, command);
        if (pci_resource_start(pdev, 8) == 1UL)
--          pci_resource_start(pdev, 8) = 0UL;
++          pdev->resource[8].start = 0UL;
          i = 0xFEFF0001UL;
        pci_write_config_dword(pdev, PCI_ROM_ADDRESS, i);
          gdth_delay(1);

diff --cc drivers/staging/telephony/Kconfig
index b5f78b6ed2bd1295fb1a5349b3d97b466d6eb335,b5f78b6ed2bd1295fb1a5349b3d97b466d6eb335..c5893e21247277e07e9f4a874d690b576072e333
--- 1/drivers/staging/telephony/Kconfig
--- 2/drivers/staging/telephony/Kconfig
+++ b/drivers/staging/telephony/Kconfig
@@@ -20,6 -20,6 +20,7 @@@ if PHON
  config PHONE_IXJ
        tristate "QuickNet Internet LineJack/PhoneJack support"
        depends on ISA || PCI
++      depends on BROKEN
        ---help---
          Say M if you have a telephony card manufactured by Quicknet
          Technologies, Inc.  These include the Internet PhoneJACK and