diff options
| -rw-r--r-- | arch/sparc/kernel/ebus.c | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 7724e2067159..7bb86b9cdaa3 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | struct linux_ebus *ebus_chain = NULL; | 25 | struct linux_ebus *ebus_chain = NULL; |
| 26 | 26 | ||
| 27 | /* We are together with pcic.c under CONFIG_PCI. */ | 27 | /* We are together with pcic.c under CONFIG_PCI. */ |
| 28 | extern unsigned int pcic_pin_to_irq(unsigned int, char *name); | 28 | extern unsigned int pcic_pin_to_irq(unsigned int, const char *name); |
| 29 | 29 | ||
| 30 | /* | 30 | /* |
| 31 | * IRQ Blacklist | 31 | * IRQ Blacklist |
| @@ -69,7 +69,7 @@ static inline unsigned long ebus_alloc(size_t size) | |||
| 69 | 69 | ||
| 70 | /* | 70 | /* |
| 71 | */ | 71 | */ |
| 72 | int __init ebus_blacklist_irq(char *name) | 72 | int __init ebus_blacklist_irq(const char *name) |
| 73 | { | 73 | { |
| 74 | struct ebus_device_irq *dp; | 74 | struct ebus_device_irq *dp; |
| 75 | 75 | ||
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; |
