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

5 files changed, 10 insertions, 14 deletions

diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index 4ce803b34..a5d2b3016 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -32,7 +32,9 @@ ifdef TADPOLE_FB_WEITEK
  FB_OBJS +=	weitek.o
 endif
 ifdef SUN_FB_CREATOR
+ ifeq ($(ARCH),sparc64)
  FB_OBJS += creator.o
+ endif
 endif
 #ifdef SUN_FB_FAST_ONE
 # FB_OBJS +=	sun_8bit_fast1.o
diff --git a/drivers/sbus/char/creator.c b/drivers/sbus/char/creator.c
index 086f9b40e..3ce90092a 100644
--- a/drivers/sbus/char/creator.c
+++ b/drivers/sbus/char/creator.c
@@ -1,4 +1,4 @@
-/* $Id: creator.c,v 1.7 1997/07/17 02:21:47 davem Exp $
+/* $Id: creator.c,v 1.8 1997/07/22 06:14:12 davem Exp $
  * creator.c: Creator/Creator3D frame buffer driver
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -235,7 +235,6 @@ ffb_wid_get (fbinfo_t *fb, struct fb_wid_list *wl)
 	struct fb_wid_item wit[30];
 	char *km = NULL;
 	int i, j;
-	u32 l;
 	int err;
 	
 #ifdef CONFIG_SPARC32_COMPAT
@@ -287,7 +286,6 @@ ffb_wid_put (fbinfo_t *fb, struct fb_wid_list *wl)
 	struct fb_wid_item wit[30];
 	char *km = NULL;
 	int i, j;
-	u32 l;
 	
 #ifdef CONFIG_SPARC32_COMPAT
 	if (current->tss.flags & SPARC_FLAG_32BIT) {
@@ -464,8 +462,6 @@ ffb_loadcmap (fbinfo_t *fb, int index, int count)
 static int
 ffb_ioctl (struct inode *inode, struct file *file, unsigned cmd, unsigned long arg, fbinfo_t *fb)
 {
-	int i;
-	
 	switch (cmd) {
 	case FBIO_WID_GET:
 		return ffb_wid_get (fb, (struct fb_wid_list *)arg);
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;
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")) {
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 */