From d9caac09471f1d1454d2751d977c9423bc7d5d16 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 11 Mar 2001 03:35:59 +0000 Subject: Compile fixes for CONFIG_SGI_NEWPORT_GFX. --- drivers/sgi/char/Makefile | 6 +++--- drivers/sgi/char/graphics_syms.c | 35 ----------------------------------- drivers/sgi/char/newport.c | 2 ++ drivers/sgi/char/rrm.c | 8 +++++--- drivers/sgi/char/sgicons.c | 7 +++++-- drivers/sgi/char/shmiq.c | 7 ++++--- drivers/sgi/char/usema.c | 6 ++++-- 7 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 drivers/sgi/char/graphics_syms.c (limited to 'drivers') 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 - * - * We should not even be trying to compile this if we are not doing - * a module. - */ - -#define __NO_VERSION__ -#include - -/* 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 + #include #include -#ifdef MODULE -#include -#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 #include #include +#include #include #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 #include #include @@ -52,6 +50,7 @@ #include #include #include +#include #include #include @@ -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 #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include #include #include "usema.h" @@ -180,3 +180,5 @@ usema_init(void) SGI_USEMACLONE); misc_register(&dev_usemaclone); } + +EXPORT_SYMBOL(usema_init); -- cgit v1.2.3