diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 12:29:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 12:29:04 -0400 |
commit | 0278ef8b484a71917bd4f03a763285cdaac10954 (patch) | |
tree | 8f6f7bf2e2a85b4643dfe3d0475811ce858fb4fc /arch/sparc/kernel/pcic.c | |
parent | 15c54033964a943de7b0763efd3bd0ede7326395 (diff) | |
parent | cd9ad58d4061494e7fdd70ded7bcf2418daf356a (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (67 commits)
[SCSI] SUNESP: Complete driver rewrite to version 2.0
[SPARC64]: Convert PCI over to generic struct iommu/strbuf.
[SPARC]: device_node name constification fallout
[SPARC64]: Convert SBUS over to generic iommu/strbuf structs.
[SPARC64]: Add generic iommu and strbuf structs to iommu.h
[SPARC64]: Consolidate {sbus,pci}_iommu_arena.
[SPARC]: Make device_node name and type const
[SPARC64]: constify some paramaters of OF routines
[TIGON3]: of_get_property() returns const.
[SPARC64]: Fix PCI rework to adhere to of_get_property() const return.
[SPARC64]: Document and fix calculation of pages_avail.
[SPARC64]: Make sure pbm->prom_node is setup easly enough in psycho.c
[SPARC64]: Use bootmem_bootmap_pages() in choose_bootmap_pfn().
[SPARC64]: Add proper header file extern for cmdline_memory_size.
[SPARC64]: Kill sparc_ultra_dump_{i,d}tlb()
[SPARC64]: Use DECLARE_BITMAP and BITS_TO_LONGS in mm/init.c
[SPARC64]: Give move verbose show_mem() output just like i386.
[SPARC64]: Mark show_mem() printk's with KERN_INFO.
[SPARC64]: Kill kvaddr_to_phys() and friends.
[SPARC64]: Privatize sun4u_get_pte() and fix name.
...
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
-rw-r--r-- | arch/sparc/kernel/pcic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 1c927c538b8b..5ca7e8f42bd9 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include <asm/irq_regs.h> | 37 | #include <asm/irq_regs.h> |
38 | 38 | ||
39 | 39 | ||
40 | unsigned int pcic_pin_to_irq(unsigned int pin, char *name); | ||
41 | |||
42 | /* | 40 | /* |
43 | * I studied different documents and many live PROMs both from 2.30 | 41 | * I studied different documents and many live PROMs both from 2.30 |
44 | * family and 3.xx versions. I came to the amazing conclusion: there is | 42 | * family and 3.xx versions. I came to the amazing conclusion: there is |
@@ -681,7 +679,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
681 | * pcic_pin_to_irq() is exported to ebus.c. | 679 | * pcic_pin_to_irq() is exported to ebus.c. |
682 | */ | 680 | */ |
683 | unsigned int | 681 | unsigned int |
684 | pcic_pin_to_irq(unsigned int pin, char *name) | 682 | pcic_pin_to_irq(unsigned int pin, const char *name) |
685 | { | 683 | { |
686 | struct linux_pcic *pcic = &pcic0; | 684 | struct linux_pcic *pcic = &pcic0; |
687 | unsigned int irq; | 685 | unsigned int irq; |