summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/weitek.c
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@nuclecu.unam.mx>1997-08-06 19:14:48 +0000
committerMiguel de Icaza <miguel@nuclecu.unam.mx>1997-08-06 19:14:48 +0000
commite2819e52a162873ff5061de81bb749831bdb5de9 (patch)
tree6067ea700202750ba335a423696f2972700e5f76 /drivers/sbus/char/weitek.c
parent17a005074429bbf143e40401f405ae4363e56828 (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/weitek.c')
-rw-r--r--drivers/sbus/char/weitek.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/sbus/char/weitek.c b/drivers/sbus/char/weitek.c
index 7b7b1bd72..7de26c2f7 100644
--- a/drivers/sbus/char/weitek.c
+++ b/drivers/sbus/char/weitek.c
@@ -1,4 +1,4 @@
-/* $Id: weitek.c,v 1.14 1997/07/17 02:21:53 davem Exp $
+/* $Id: weitek.c,v 1.15 1997/07/22 06:14:11 davem Exp $
* weitek.c: Tadpole P9100/P9000 console driver
*
* Copyright (C) 1996 David Redman (djhr@tadpole.co.uk)
@@ -99,8 +99,6 @@ weitek_loadcmap (void *fbinfo, int index, int count)
__initfunc(void weitek_setup(fbinfo_t *fb, int slot, u32 addr, int io))
{
- extern struct screen_info screen_info;
-
printk ("weitek%d at 0x%8.8x\n", slot, addr);
/* Fill in parameters we left out */