Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d66f151 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Add Kconfig option to disable deprecated pci_find_* API
  PCI: pciserial_resume_one ignored return value of pci_enable_device
  PCI Hotplug: cpqhp_pushbutton_thread(): remove a pointless if() check
  PCI: make pci_match_device() static
  PCI: Remove 3 incorrect MSI quirks.
  PCI: Add MSI INTX_DISABLE quirks for ATI SB700/800 SATA and IXP SB400 USB
  PCI: Add quirk for devices which disable MSI when INTX_DISABLE is set.
  PCI: Add MSI quirk for ServerWorks HT1000 PCIX bridge.
  PCI: Revert "PCI: disable MSI by default on systems with Serverworks HT1000 chips"
parents 3131e530 bd3989e0

drivers/isdn/hisax/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ config HISAX_16_3 


config HISAX_TELESPCI

	bool "Teles PCI"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	help

	  This enables HiSax support for the Teles PCI.

	  See <file:Documentation/isdn/README.HiSax> on how to configure it.
@@ -237,7 +237,7 @@ config HISAX_MIC 


config HISAX_NETJET

	bool "NETjet card"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	help

	  This enables HiSax support for the NetJet from Traverse

	  Technologies.
@@ -248,7 +248,7 @@ config HISAX_NETJET 


config HISAX_NETJET_U

	bool "NETspider U card"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	help

	  This enables HiSax support for the Netspider U interface ISDN card

	  from Traverse Technologies.
@@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR 


config HISAX_BKM_A4T

	bool "Telekom A4T card"

	depends on PCI

	depends on PCI && PCI_LEGACY

	help

	  This enables HiSax support for the Telekom A4T card.
@@ -297,7 +297,7 @@ config HISAX_BKM_A4T 


config HISAX_SCT_QUADRO

	bool "Scitel Quadro card"

	depends on PCI

	depends on PCI && PCI_LEGACY

	help

	  This enables HiSax support for the Scitel Quadro card.
@@ -316,7 +316,7 @@ config HISAX_GAZEL 


config HISAX_HFC_PCI

	bool "HFC PCI-Bus cards"

	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	help

	  This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
@@ -325,7 +325,7 @@ config HISAX_HFC_PCI 


config HISAX_W6692

	bool "Winbond W6692 based cards"

	depends on PCI

	depends on PCI && PCI_LEGACY

	help

	  This enables HiSax support for Winbond W6692 based PCI ISDN cards.
@@ -341,7 +341,7 @@ config HISAX_HFC_SX 


config HISAX_ENTERNOW_PCI

	bool "Formula-n enter:now PCI card"

	depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

	help

	  This enables HiSax support for the Formula-n enter:now PCI

	  ISDN card.
@@ -411,7 +411,7 @@ config HISAX_HFC4S8S 


config HISAX_FRITZ_PCIPNP

	tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	depends on PCI && PCI_LEGACY && EXPERIMENTAL

	help

	  This enables the driver for the AVM Fritz!Card PCI,

	  Fritz!Card PCI v2 and Fritz!Card PnP.

drivers/isdn/hisax/avm_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) 


#endif /* __ISAPNP__ */



#ifndef CONFIG_PCI

#ifndef CONFIG_PCI_LEGACY



static int __devinit avm_pci_setup(struct IsdnCardState *cs)

{
@@ -872,7 +872,7 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs) 
	return (1);

}



#endif /* CONFIG_PCI */

#endif /* CONFIG_PCI_LEGACY */



int __devinit

setup_avm_pcipnp(struct IsdnCard *card)

drivers/isdn/hisax/diva.c

+3 −3
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) 


#endif	/* ISAPNP */



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI_LEGACY

static struct pci_dev *dev_diva __devinitdata = NULL;

static struct pci_dev *dev_diva_u __devinitdata = NULL;

static struct pci_dev *dev_diva201 __devinitdata = NULL;
@@ -1229,14 +1229,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) 
	return (1);		/* card found */

}



#else	/* if !CONFIG_PCI */

#else	/* if !CONFIG_PCI_LEGACY */



static int __devinit setup_diva_pci(struct IsdnCard *card)

{

	return (-1);	/* card not found; continue search */

}



#endif	/* CONFIG_PCI */

#endif	/* CONFIG_PCI_LEGACY */



int __devinit

setup_diva(struct IsdnCard *card)

drivers/isdn/hisax/elsa.c

+2 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ setup_elsa_pcmcia(struct IsdnCard *card) 
	       cs->irq);

}



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI_LEGACY

static 	struct pci_dev *dev_qs1000 __devinitdata = NULL;

static 	struct pci_dev *dev_qs3000 __devinitdata = NULL;
@@ -1093,7 +1093,7 @@ setup_elsa_pci(struct IsdnCard *card) 
{

	return (1);

}

#endif /* CONFIG_PCI */

#endif /* CONFIG_PCI_LEGACY */



static int __devinit

setup_elsa_common(struct IsdnCard *card)

drivers/isdn/hisax/gazel.c

+3 −1
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) 
	return (0);

}



#ifdef CONFIG_PCI_LEGACY

static struct pci_dev *dev_tel __devinitdata = NULL;



static int __devinit
@@ -620,6 +621,7 @@ setup_gazelpci(struct IsdnCardState *cs) 


	return (0);

}

#endif /* CONFIG_PCI_LEGACY */



int __devinit

setup_gazel(struct IsdnCard *card)
@@ -639,7 +641,7 @@ setup_gazel(struct IsdnCard *card) 
			return (0);

	} else {



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI_LEGACY

		if (setup_gazelpci(cs))

			return (0);

#else