summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 22:14:15 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-21 22:14:15 +0400
commit34acae3ce3472f6365d5724252f82032bbc06d63 (patch)
tree842f22458bcf01c48e527e8d8848d8d014aa2518 /drivers
parent795233bfd65916a7d1d3b086f056bd7af03c50fe (diff)
parent967f038e491bc0aa469c4187aab7715ee9069ae1 (diff)
downloadlinux-34acae3ce3472f6365d5724252f82032bbc06d63.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Three minor fixes from David Howells and Paul Gortmaker" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2] sparc32: make copy_to/from_user_page() usable from modular code sparc32: fix build failure for arch_jump_label_transform
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sbus/char/jsflash.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6b4678a7900a..4ccb5d869389 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -507,7 +507,6 @@ static int jsflash_init(void)
}
/* Let us be really paranoid for modifications to probing code. */
- /* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
if (sparc_cpu_model != sun4m) {
/* We must be on sun4m because we use MMU Bypass ASI. */
return -ENXIO;