diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /arch/sparc/include/asm/pcic.h | |
| parent | ad8686bc05adc2b8301d749f5958bd904f3a46ee (diff) | |
| parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'arch/sparc/include/asm/pcic.h')
| -rw-r--r-- | arch/sparc/include/asm/pcic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h index 6676cbcc8b6a..f41706792592 100644 --- a/arch/sparc/include/asm/pcic.h +++ b/arch/sparc/include/asm/pcic.h | |||
| @@ -30,10 +30,10 @@ struct linux_pcic { | |||
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_PCIC_PCI | 32 | #ifdef CONFIG_PCIC_PCI |
| 33 | extern int pcic_present(void); | 33 | int pcic_present(void); |
| 34 | extern int pcic_probe(void); | 34 | int pcic_probe(void); |
| 35 | extern void pci_time_init(void); | 35 | void pci_time_init(void); |
| 36 | extern void sun4m_pci_init_IRQ(void); | 36 | void sun4m_pci_init_IRQ(void); |
| 37 | #else | 37 | #else |
| 38 | static inline int pcic_present(void) { return 0; } | 38 | static inline int pcic_present(void) { return 0; } |
| 39 | static inline int pcic_probe(void) { return 0; } | 39 | static inline int pcic_probe(void) { return 0; } |