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 tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sparc
/
kernel
/
pcic.c
diff --git
a/arch/sparc/kernel/pcic.c
b/arch/sparc/kernel/pcic.c
index 521fdf1b20e592e06f9776c85e04b3a575019b0e..09f4fdd8d8080fd45f8795a193b9b308c5d748cc 100644
(file)
--- a/
arch/sparc/kernel/pcic.c
+++ b/
arch/sparc/kernel/pcic.c
@@
-439,8
+439,7
@@
int pcic_present(void)
return pcic0_up;
}
return pcic0_up;
}
-static int __devinit pdev_to_pnode(struct linux_pbm_info *pbm,
- struct pci_dev *pdev)
+static int pdev_to_pnode(struct linux_pbm_info *pbm, struct pci_dev *pdev)
{
struct linux_prom_pci_registers regs[PROMREG_MAX];
int err;
{
struct linux_prom_pci_registers regs[PROMREG_MAX];
int err;
@@
-595,7
+594,7
@@
pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
/*
* Normally called from {do_}pci_scan_bus...
*/
/*
* Normally called from {do_}pci_scan_bus...
*/
-void
__devinit
pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
{
struct pci_dev *dev;
int i, has_io, has_mem;
{
struct pci_dev *dev;
int i, has_io, has_mem;