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

Commit f85f19de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: remove printks about disabled bridge windows
  PCI: fold pci_calc_resource_flags() into decode_bar()
  PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
  PCI: correct pcie_set_readrq write size
  PCI: pciehp: change wait time for valid configuration access
  x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
  PCI: ARI is a PCIe v2 feature
  x86/PCI: quirks: Use pci_dev->revision
  PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
  PCI hotplug: cpqphp: use pci_dev->vendor
  PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
  x86/PCI: config space accessor functions should not ignore the segment argument
  PCI: Assign values to 'pci_obff_signal_type' enumeration constants
  x86/PCI: reduce severity of host bridge window conflict warnings
  PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI
  PCI: PCIe AER: add aer_recover_queue
  x86/PCI: select direct access mode for mmconfig option
  PCI hotplug: Rename is_ejectable which also exists in dock.c
parents b993fdbc 7b87c9df

arch/alpha/kernel/sys_alcor.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ alcor_init_irq(void) 
 */

 */





static int __init

static int __init

alcor_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

alcor_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[7][5] __initdata = {

	static char irq_tab[7][5] __initdata = {

		/*INT    INTA   INTB   INTC   INTD */

		/*INT    INTA   INTB   INTC   INTD */

arch/alpha/kernel/sys_cabriolet.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ pc164_init_irq(void) 
 */

 */





static inline int __init

static inline int __init

eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[5][5] __initdata = {

	static char irq_tab[5][5] __initdata = {

		/*INT  INTA  INTB  INTC   INTD */

		/*INT  INTA  INTB  INTC   INTD */
@@ -205,7 +205,7 @@ eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
 */

 */





static inline int __init

static inline int __init

cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

cabriolet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[5][5] __initdata = {

	static char irq_tab[5][5] __initdata = {

		/*INT   INTA  INTB  INTC   INTD */

		/*INT   INTA  INTB  INTC   INTD */
@@ -289,7 +289,7 @@ cia_cab_init_pci(void) 
 */

 */





static inline int __init

static inline int __init

alphapc164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

alphapc164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[7][5] __initdata = {

	static char irq_tab[7][5] __initdata = {

		/*INT   INTA  INTB   INTC   INTD */

		/*INT   INTA  INTB   INTC   INTD */

arch/alpha/kernel/sys_dp264.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ isa_irq_fixup(struct pci_dev *dev, int irq) 
}

}





static int __init

static int __init

dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

dp264_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[6][5] __initdata = {

	static char irq_tab[6][5] __initdata = {

		/*INT    INTA   INTB   INTC   INTD */

		/*INT    INTA   INTB   INTC   INTD */
@@ -404,7 +404,7 @@ dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
}

}





static int __init

static int __init

monet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

monet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[13][5] __initdata = {

	static char irq_tab[13][5] __initdata = {

		/*INT    INTA   INTB   INTC   INTD */

		/*INT    INTA   INTB   INTC   INTD */
@@ -466,7 +466,7 @@ monet_swizzle(struct pci_dev *dev, u8 *pinp) 
}

}





static int __init

static int __init

webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

webbrick_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[13][5] __initdata = {

	static char irq_tab[13][5] __initdata = {

		/*INT    INTA   INTB   INTC   INTD */

		/*INT    INTA   INTB   INTC   INTD */
@@ -488,7 +488,7 @@ webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
}

}





static int __init

static int __init

clipper_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

clipper_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[7][5] __initdata = {

	static char irq_tab[7][5] __initdata = {

		/*INT    INTA   INTB   INTC   INTD */

		/*INT    INTA   INTB   INTC   INTD */

arch/alpha/kernel/sys_eb64p.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ eb64p_init_irq(void) 
 */

 */





static int __init

static int __init

eb64p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

eb64p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	static char irq_tab[5][5] __initdata = {

	static char irq_tab[5][5] __initdata = {

		/*INT  INTA  INTB  INTC   INTD */

		/*INT  INTA  INTB  INTC   INTD */

arch/alpha/kernel/sys_eiger.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ eiger_init_irq(void) 
}

}





static int __init

static int __init

eiger_map_irq(struct pci_dev *dev, u8 slot, u8 pin)

eiger_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

{

	u8 irq_orig;

	u8 irq_orig;