projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
pcic.c
diff --git
a/arch/sparc/kernel/pcic.c
b/arch/sparc/kernel/pcic.c
index
462584e
..
75ed98b
100644
(file)
--- a/
arch/sparc/kernel/pcic.c
+++ b/
arch/sparc/kernel/pcic.c
@@
-436,7
+436,7
@@
int pcic_present(void)
return pcic0_up;
}
-static int __
init pdev_to_pnode(struct linux_pbm_info *pbm,
+static int __
devinit pdev_to_pnode(struct linux_pbm_info *pbm,
struct pci_dev *pdev)
{
struct linux_prom_pci_registers regs[PROMREG_MAX];