diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:35:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:35:05 -0400 |
commit | f85f19de90a9997583bb26e6f1f9297a4e152c18 (patch) | |
tree | 2dfe61dab6c39ca202f114cb68c68978da1624e3 /arch/arm/mach-footbridge | |
parent | b993fdbc7fe26f96b59003a3552c418a71aa0a9f (diff) | |
parent | 7b87c9df5602efd6c7edeb291bbd104d49a6babf (diff) |
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
Diffstat (limited to 'arch/arm/mach-footbridge')
-rw-r--r-- | arch/arm/mach-footbridge/cats-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/ebsa285-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/netwinder-pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/personal-pci.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c index ae3e1c8c758..32321f66dec 100644 --- a/arch/arm/mach-footbridge/cats-pci.c +++ b/arch/arm/mach-footbridge/cats-pci.c | |||
@@ -16,7 +16,7 @@ | |||
16 | /* cats host-specific stuff */ | 16 | /* cats host-specific stuff */ |
17 | static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; | 17 | static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; |
18 | 18 | ||
19 | static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 19 | static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
20 | { | 20 | { |
21 | if (dev->irq >= 255) | 21 | if (dev->irq >= 255) |
22 | return -1; /* not a valid interrupt. */ | 22 | return -1; /* not a valid interrupt. */ |
diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c index e5ab5bddbc8..511c673ffa9 100644 --- a/arch/arm/mach-footbridge/ebsa285-pci.c +++ b/arch/arm/mach-footbridge/ebsa285-pci.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; | 16 | static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; |
17 | 17 | ||
18 | static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 18 | static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
19 | { | 19 | { |
20 | if (dev->vendor == PCI_VENDOR_ID_CONTAQ && | 20 | if (dev->vendor == PCI_VENDOR_ID_CONTAQ && |
21 | dev->device == PCI_DEVICE_ID_CONTAQ_82C693) | 21 | dev->device == PCI_DEVICE_ID_CONTAQ_82C693) |
diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c index e263d6d54a0..62187610e17 100644 --- a/arch/arm/mach-footbridge/netwinder-pci.c +++ b/arch/arm/mach-footbridge/netwinder-pci.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * We now use the slot ID instead of the device identifiers to select | 17 | * We now use the slot ID instead of the device identifiers to select |
18 | * which interrupt is routed where. | 18 | * which interrupt is routed where. |
19 | */ | 19 | */ |
20 | static int __init netwinder_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 20 | static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
21 | { | 21 | { |
22 | switch (slot) { | 22 | switch (slot) { |
23 | case 0: /* host bridge */ | 23 | case 0: /* host bridge */ |
diff --git a/arch/arm/mach-footbridge/personal-pci.c b/arch/arm/mach-footbridge/personal-pci.c index d5fca95afda..aeb651d914a 100644 --- a/arch/arm/mach-footbridge/personal-pci.c +++ b/arch/arm/mach-footbridge/personal-pci.c | |||
@@ -18,7 +18,8 @@ static int irqmap_personal_server[] __initdata = { | |||
18 | IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI | 18 | IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI |
19 | }; | 19 | }; |
20 | 20 | ||
21 | static int __init personal_server_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 21 | static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot, |
22 | u8 pin) | ||
22 | { | 23 | { |
23 | unsigned char line; | 24 | unsigned char line; |
24 | 25 | ||