summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/starfire.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-27 03:50:42 +0300
committerMark Brown <broonie@kernel.org>2015-03-27 03:50:42 +0300
commit1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch)
tree2d89734fc831593784bd411be03a1b9649de4c9d /arch/sparc/include/asm/starfire.h
parent6935224da2482a261c786501fbccb1dc4a675225 (diff)
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff)
downloadlinux-1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8.tar.xz
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
Diffstat (limited to 'arch/sparc/include/asm/starfire.h')
-rw-r--r--arch/sparc/include/asm/starfire.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h
index c100dc27a0a9..176fa0ad19f1 100644
--- a/arch/sparc/include/asm/starfire.h
+++ b/arch/sparc/include/asm/starfire.h
@@ -12,7 +12,6 @@
extern int this_is_starfire;
void check_if_starfire(void);
-int starfire_hard_smp_processor_id(void);
void starfire_hookup(int);
unsigned int starfire_translate(unsigned long imap, unsigned int upaid);