Compile fixes for CONFIG_SGI_NEWPORT_GFX.

11 files changed, 34 insertions, 53 deletions

diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 57e3325dd..16ed11ac7 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -9,6 +9,7 @@
 
 O_TARGET := mm.o
 
+export-objs			+= umap.o
 obj-y				+= extable.o init.o fault.o loadmmu.o
 
 obj-$(CONFIG_CPU_R3000)		+= r2300.o
diff --git a/arch/mips/mm/umap.c b/arch/mips/mm/umap.c
index 465bec37b..c952004c9 100644
--- a/arch/mips/mm/umap.c
+++ b/arch/mips/mm/umap.c
@@ -1,6 +1,4 @@
 /*
- * arch/mips/mm/umap.c
- *
  * (C) Copyright 1994 Linus Torvalds
  *
  * Changes:
@@ -21,6 +19,7 @@
 #include <linux/shm.h>
 #include <linux/errno.h>
 #include <linux/mman.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/swap.h>
@@ -106,6 +105,8 @@ remove_mapping (struct task_struct *task, unsigned long start, unsigned long end
 	up (&task->mm->mmap_sem);
 }
 
+EXPORT_SYMBOL(remove_mapping);
+
 void *vmalloc_uncached (unsigned long size)
 {
 	return __vmalloc (size, GFP_KERNEL | __GFP_HIGHMEM,
diff --git a/arch/mips64/mm/Makefile b/arch/mips64/mm/Makefile
index 3b5cea2a6..48dc554e7 100644
--- a/arch/mips64/mm/Makefile
+++ b/arch/mips64/mm/Makefile
@@ -4,7 +4,8 @@
 
 O_TARGET := mm.o
 
-obj-y	 := extable.o init.o fault.o loadmmu.o
+export-objs			+= umap.o
+obj-y				:= extable.o init.o fault.o loadmmu.o
 
 obj-$(CONFIG_CPU_R4300)		+= r4xx0.o
 obj-$(CONFIG_CPU_R4X00)		+= r4xx0.o
diff --git a/arch/mips64/mm/umap.c b/arch/mips64/mm/umap.c
index 9b0e7db1e..81a77122a 100644
--- a/arch/mips64/mm/umap.c
+++ b/arch/mips64/mm/umap.c
@@ -1,11 +1,11 @@
-/* $Id: umap.c,v 1.4 2000/01/29 01:41:59 ralf Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
  * Copyright (C) 1994 Linus Torvalds
  * Copyright (C) 1997 Miguel de Icaza
+ * Copyright (C) 2001 Ralf Baechle
  */
 #include <linux/stat.h>
 #include <linux/sched.h>
@@ -16,6 +16,7 @@
 #include <linux/shm.h>
 #include <linux/errno.h>
 #include <linux/mman.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/swap.h>
@@ -101,6 +102,8 @@ remove_mapping (struct task_struct *task, unsigned long start, unsigned long end
 	up (&task->mm->mmap_sem);
 }
 
+EXPORT_SYMBOL(remove_mapping);
+
 void *vmalloc_uncached (unsigned long size)
 {
 	return vmalloc_prot (size, PAGE_KERNEL_UNCACHED);
diff --git a/drivers/sgi/char/Makefile b/drivers/sgi/char/Makefile
index ea6a6d533..b6fec19d2 100644
--- a/drivers/sgi/char/Makefile
+++ b/drivers/sgi/char/Makefile
@@ -9,11 +9,11 @@
 
 O_TARGET := sgichar.o
 
-export-objs	:= newport.o graphics_syms.o
-obj-y		:= newport.o sgicons.o usema.o shmiq.o streamable.o
+export-objs	:= newport.o shmiq.o sgicons.o usema.o
+obj-y		:= newport.o shmiq.o sgicons.o usema.o streamable.o
 
 obj-$(CONFIG_SGI_SERIAL)	+= sgiserial.o
 obj-$(CONFIG_SGI_DS1286)	+= ds1286.o
-obj-$(CONFIG_SGI_NEWPORT_GFX)	+= graphics_syms.o graphics.o rrm.o
+obj-$(CONFIG_SGI_NEWPORT_GFX)	+= graphics.o rrm.o
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/sgi/char/graphics_syms.c b/drivers/sgi/char/graphics_syms.c
deleted file mode 100644
index 0a36ed76e..000000000
--- a/drivers/sgi/char/graphics_syms.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * graphics_syms.c: interfaces for SGI Indy newport graphics
- *
- * Copyright (C) 1999 Alex deVries <puffin@redhat.com>
- *
- * We should not even be trying to compile this if we are not doing
- * a module.
- */
-
-#define __NO_VERSION__
-#include <linux/module.h>
-
-/* extern int rrm_command (unsigned int cmd, void *arg);
-extern int rrm_close (struct inode *inode, struct file *file);
-EXPORT_SYMBOL(rrm_command);
-EXPORT_SYMBOL(rrm_close);
-
-
-*/
-extern void shmiq_init (void);
-extern void usema_init(void);
-
-EXPORT_SYMBOL(shmiq_init);
-EXPORT_SYMBOL(usema_init);
-
-extern void disable_gconsole(void);
-extern void enable_gconsole(void);
-extern void remove_mapping (struct task_struct *task, unsigned long start,
-      unsigned long end);
-
-EXPORT_SYMBOL(disable_gconsole);
-EXPORT_SYMBOL(enable_gconsole);
-EXPORT_SYMBOL(remove_mapping);
-
-EXPORT_SYMBOL(npregs);
diff --git a/drivers/sgi/char/newport.c b/drivers/sgi/char/newport.c
index 74c9f294c..80b8dca0c 100644
--- a/drivers/sgi/char/newport.c
+++ b/drivers/sgi/char/newport.c
@@ -16,6 +16,8 @@
 
 struct newport_regs *npregs;
 
+EXPORT_SYMBOL(npregs);
+
 /* Kernel routines for supporting graphics context switching */
 
 void newport_save (void *y)
diff --git a/drivers/sgi/char/rrm.c b/drivers/sgi/char/rrm.c
index 57989c014..b0248ddb2 100644
--- a/drivers/sgi/char/rrm.c
+++ b/drivers/sgi/char/rrm.c
@@ -9,12 +9,11 @@
  *
  * Fixes:
  */
+#include <linux/module.h>
+
 #include <asm/uaccess.h>
 #include <asm/rrm.h>
 
-#ifdef MODULE
-#include <linux/module.h>
-#endif
 
 int
 rrm_open_rn (int rnid, void *arg)
@@ -71,3 +70,6 @@ rrm_close (struct inode *inode, struct file *file)
 	/* This routine is invoked when the device is closed */
 	return 0;
 }
+
+EXPORT_SYMBOL(rrm_command);
+EXPORT_SYMBOL(rrm_close);
diff --git a/drivers/sgi/char/sgicons.c b/drivers/sgi/char/sgicons.c
index 2ade5a311..7df5f3393 100644
--- a/drivers/sgi/char/sgicons.c
+++ b/drivers/sgi/char/sgicons.c
@@ -1,5 +1,4 @@
-/* $Id: sgicons.c,v 1.10 1998/08/25 09:18:58 ralf Exp $
- *
+/*
  * sgicons.c: Setting up and registering console I/O on the SGI.
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
@@ -10,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <asm/uaccess.h>
 #include "gconsole.h"
 
@@ -36,6 +36,9 @@ disable_gconsole (void)
 	}
 }
 
+EXPORT_SYMBOL(disable_gconsole);
+EXPORT_SYMBOL(enable_gconsole);
+
 void
 register_gconsole (struct console_ops *gc)
 {
diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c
index 1438030b3..626686955 100644
--- a/drivers/sgi/char/shmiq.c
+++ b/drivers/sgi/char/shmiq.c
@@ -1,5 +1,4 @@
-/* $Id: shmiq.c,v 1.19 2000/02/23 00:41:21 ralf Exp $
- *
+/*
  * shmiq.c: shared memory input queue driver
  * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx)
  *
@@ -42,7 +41,6 @@
  * Until then, I just allow for 1 qcntl device.
  *
  */
-
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/sched.h>
@@ -52,6 +50,7 @@
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
 #include <linux/major.h>
+#include <linux/module.h>
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h>
 
@@ -470,3 +469,5 @@ shmiq_init (void)
 			       S_IFCHR | S_IRUSR | S_IWUSR,
 			       &shmiq_fops, NULL);
 }
+
+EXPORT_SYMBOL(shmiq_init);
diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c
index 4ae9d2e2b..462e18152 100644
--- a/drivers/sgi/char/usema.c
+++ b/drivers/sgi/char/usema.c
@@ -20,8 +20,7 @@
  * usema(7m), usinit(3p), usnewsema(3p)
  * /usr/include/sys/usioctl.h 
  *
-*/
-
+ */
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/sched.h>
@@ -31,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/dcache.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include "usema.h"
@@ -180,3 +180,5 @@ usema_init(void)
 	       SGI_USEMACLONE);
 	misc_register(&dev_usemaclone);
 }
+
+EXPORT_SYMBOL(usema_init);