From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 11 Nov 2012 23:52:40 +0000 (+1100)
Subject: Merge remote-tracking branch 'pci/next'
X-Git-Tag: next-20121112~89
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9e5d4a784ee28c30dbc7886cd4af71a4a28c9eed;p=karo-tx-linux.git

Merge remote-tracking branch 'pci/next'
---

9e5d4a784ee28c30dbc7886cd4af71a4a28c9eed
diff --cc drivers/scsi/gdth.c
index 5d72274c507f,5d72274c507f..5209e81e48f2
--- a/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 b5f78b6ed2bd,b5f78b6ed2bd..c5893e212472
--- a/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