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/tcx.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/tcx.c')
| -rw-r--r-- | drivers/sbus/char/tcx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/tcx.c b/drivers/sbus/char/tcx.c index 20c14a687..9eaad5bc7 100644 --- a/drivers/sbus/char/tcx.c +++ b/drivers/sbus/char/tcx.c @@ -1,4 +1,4 @@ -/* $Id: tcx.c,v 1.17 1997/07/17 02:21:50 davem Exp $ +/* $Id: tcx.c,v 1.18 1997/07/22 06:14:09 davem Exp $ * tcx.c: SUNW,tcx 24/8bit frame buffer driver * * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -309,9 +309,9 @@ __initfunc(void tcx_setup (fbinfo_t *fb, int slot, int node, u32 tcx, struct lin tcxinfo->tec = sparc_alloc_io((u32)tcxinfo->tcx_offsets [TCX_TEC_OFFSET], 0, sizeof (struct tcx_tec), "tcx_tec", fb->space, 0); if (!fb->base){ - fb->base = (uint) - sparc_alloc_io((u32)tcxinfo->tcx_offsets [TCX_RAM8BIT_OFFSET], 0, - fb->type.fb_size, "tcx_ram", fb->space, 0); + fb->base = (unsigned long) + sparc_alloc_io((u32)tcxinfo->tcx_offsets [TCX_RAM8BIT_OFFSET], + 0, fb->type.fb_size, "tcx_ram", fb->space, 0); } if (prom_getbool (node, "hw-cursor")) { |