diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-31 09:08:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-31 09:08:13 +0200 |
| commit | c5e77f5216abdd1d98e6d14d9a3eb4e88d80011a (patch) | |
| tree | a542b5bb7d96a8f37c4d5e3319086064448ed67b /arch/sparc/include/asm/starfire.h | |
| parent | de81e64b250d3865a75d221a80b4311e3273670a (diff) | |
| parent | e42391cd048809d903291d07f86ed3934ce138e9 (diff) | |
| download | op-kernel-dev-c5e77f5216abdd1d98e6d14d9a3eb4e88d80011a.zip op-kernel-dev-c5e77f5216abdd1d98e6d14d9a3eb4e88d80011a.tar.gz | |
Merge tag 'v4.0-rc6' into timers/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/include/asm/starfire.h')
| -rw-r--r-- | arch/sparc/include/asm/starfire.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h index c100dc2..176fa0a 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); |
