diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /drivers/sbus/char/suncons.c | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'drivers/sbus/char/suncons.c')
| -rw-r--r-- | drivers/sbus/char/suncons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/suncons.c b/drivers/sbus/char/suncons.c index cad446904..111f65f97 100644 --- a/drivers/sbus/char/suncons.c +++ b/drivers/sbus/char/suncons.c @@ -1,4 +1,4 @@ -/* $Id: suncons.c,v 1.66 1997/07/15 09:48:47 jj Exp $ +/* $Id: suncons.c,v 1.67 1997/07/20 05:59:42 davem Exp $ * * suncons.c: Sun SparcStation console support. * @@ -931,7 +931,7 @@ __initfunc(static void leo_setup (&fbinfo [n], n, base, io); break; #endif -#ifdef SUN_FB_CREATOR +#if defined(SUN_FB_CREATOR) && defined(__sparc_v9__) case FBTYPE_CREATOR: creator_setup (&fbinfo [n], n, con_node, base, io); break; |