diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 10:55:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 10:55:14 -0500 |
commit | 33b07db9f38fe73b3895f8d4db8fdee03e3afec3 (patch) | |
tree | 69bb1d5519d0b1e5aa3cf59ad430b143aad71171 /arch/sparc64/kernel/pci_psycho.c | |
parent | d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c (diff) |
Revert "of_platform_driver noise on sparce"
This reverts commit e669dae6141ff97d3c7566207f5de3b487dcf837, since it
is incomplete, and clashes with fuller patches and the sparc 32/64
unification effort.
Requested-by: David Miller <davem@davemloft.net>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc64/kernel/pci_psycho.c')
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 56605adbb5b3..dfb3ec892987 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -493,7 +493,7 @@ static void __init psycho_pbm_init(struct pci_pbm_info *pbm, | |||
493 | psycho_scan_bus(pbm, &op->dev); | 493 | psycho_scan_bus(pbm, &op->dev); |
494 | } | 494 | } |
495 | 495 | ||
496 | static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid) | 496 | static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) |
497 | { | 497 | { |
498 | struct pci_pbm_info *pbm; | 498 | struct pci_pbm_info *pbm; |
499 | 499 | ||
@@ -506,7 +506,7 @@ static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid) | |||
506 | 506 | ||
507 | #define PSYCHO_CONFIGSPACE 0x001000000UL | 507 | #define PSYCHO_CONFIGSPACE 0x001000000UL |
508 | 508 | ||
509 | static int __init psycho_probe(struct of_device *op, | 509 | static int __devinit psycho_probe(struct of_device *op, |
510 | const struct of_device_id *match) | 510 | const struct of_device_id *match) |
511 | { | 511 | { |
512 | const struct linux_prom64_registers *pr_regs; | 512 | const struct linux_prom64_registers *pr_regs; |