diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/unicore32 | |
parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 100eab842e6..4892fbb54eb 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -102,7 +102,7 @@ void pci_puv3_preinit(void) | |||
102 | writel(readl(PCIBRI_CMD) | PCIBRI_CMD_IO | PCIBRI_CMD_MEM, PCIBRI_CMD); | 102 | writel(readl(PCIBRI_CMD) | PCIBRI_CMD_IO | PCIBRI_CMD_MEM, PCIBRI_CMD); |
103 | } | 103 | } |
104 | 104 | ||
105 | static int __init pci_puv3_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 105 | static int __init pci_puv3_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
106 | { | 106 | { |
107 | if (dev->bus->number == 0) { | 107 | if (dev->bus->number == 0) { |
108 | #ifdef CONFIG_ARCH_FPGA /* 4 pci slots */ | 108 | #ifdef CONFIG_ARCH_FPGA /* 4 pci slots */ |