diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/sparc/kernel/entry.h | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/sparc/kernel/entry.h')
| -rw-r--r-- | arch/sparc/kernel/entry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h index cc3c5cb47cda..9c179fbfb219 100644 --- a/arch/sparc/kernel/entry.h +++ b/arch/sparc/kernel/entry.h | |||
| @@ -250,7 +250,7 @@ extern struct ino_bucket *ivector_table; | |||
| 250 | extern unsigned long ivector_table_pa; | 250 | extern unsigned long ivector_table_pa; |
| 251 | 251 | ||
| 252 | extern void init_irqwork_curcpu(void); | 252 | extern void init_irqwork_curcpu(void); |
| 253 | extern void __cpuinit sun4v_register_mondo_queues(int this_cpu); | 253 | extern void sun4v_register_mondo_queues(int this_cpu); |
| 254 | 254 | ||
| 255 | #endif /* CONFIG_SPARC32 */ | 255 | #endif /* CONFIG_SPARC32 */ |
| 256 | #endif /* _ENTRY_H */ | 256 | #endif /* _ENTRY_H */ |