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/prom | |
| 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/prom')
| -rw-r--r-- | arch/sparc/prom/misc_64.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/prom/misc_64.c b/arch/sparc/prom/misc_64.c index f178b9dcc7b7..53a696d3eb3b 100644 --- a/arch/sparc/prom/misc_64.c +++ b/arch/sparc/prom/misc_64.c | |||
| @@ -81,11 +81,6 @@ void prom_feval(const char *fstring) | |||
| 81 | } | 81 | } |
| 82 | EXPORT_SYMBOL(prom_feval); | 82 | EXPORT_SYMBOL(prom_feval); |
| 83 | 83 | ||
| 84 | #ifdef CONFIG_SMP | ||
| 85 | extern void smp_capture(void); | ||
| 86 | extern void smp_release(void); | ||
| 87 | #endif | ||
| 88 | |||
| 89 | /* Drop into the prom, with the chance to continue with the 'go' | 84 | /* Drop into the prom, with the chance to continue with the 'go' |
| 90 | * prom command. | 85 | * prom command. |
| 91 | */ | 86 | */ |