projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
pci
/
pci-ip27.c
diff --git
a/arch/mips/pci/pci-ip27.c
b/arch/mips/pci/pci-ip27.c
index fdc24440294c7028c6fdf7e2a655b896dbe60ef7..7f4f49b09b5b90ba62b1cae28685066b11063ff2 100644
(file)
--- a/
arch/mips/pci/pci-ip27.c
+++ b/
arch/mips/pci/pci-ip27.c
@@
-143,7
+143,7
@@
int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
* A given PCI device, in general, should be able to intr any of the cpus
* on any one of the hubs connected to its xbow.
*/
* A given PCI device, in general, should be able to intr any of the cpus
* on any one of the hubs connected to its xbow.
*/
-int
__devinit
pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
return 0;
}
{
return 0;
}
@@
-212,7
+212,7
@@
static inline void pci_enable_swapping(struct pci_dev *dev)
bridge->b_widget.w_tflush; /* Flush */
}
bridge->b_widget.w_tflush; /* Flush */
}
-static void
__devinit
pci_fixup_ioc3(struct pci_dev *d)
+static void pci_fixup_ioc3(struct pci_dev *d)
{
pci_disable_swapping(d);
}
{
pci_disable_swapping(d);
}