summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2012-05-10 15:23:20 +0000
committermarius <marius@FreeBSD.org>2012-05-10 15:23:20 +0000
commite5cc26d604a1768dfc22fbc48152ac8aff87b232 (patch)
tree037636b4e076008514a6e5bad3ebbe1a000ec22f
parentd42dce6416c614b6dc3f38b66634fb892e809b1a (diff)
downloadFreeBSD-src-e5cc26d604a1768dfc22fbc48152ac8aff87b232.zip
FreeBSD-src-e5cc26d604a1768dfc22fbc48152ac8aff87b232.tar.gz
Fix mismerge in r235231.
-rw-r--r--sys/sparc64/include/intr_machdep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h
index 1645fd6..6803fc62 100644
--- a/sys/sparc64/include/intr_machdep.h
+++ b/sys/sparc64/include/intr_machdep.h
@@ -91,8 +91,8 @@ struct intr_vector {
extern ih_func_t *intr_handlers[];
extern struct intr_vector intr_vectors[];
-#ifdef SMP
void intr_add_cpu(u_int cpu);
+#ifdef SMP
int intr_bind(int vec, u_char cpu);
#endif
int intr_describe(int vec, void *ih, const char *descr);
OpenPOWER on IntegriCloud