summaryrefslogtreecommitdiffstats
path: root/drivers/sgi/char
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
commit4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch)
treecddb50a81d7d1a628cc400519162080c6d87868e /drivers/sgi/char
parent36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff)
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs. o FPU context switch fixes. o Lazy context switches. o Faster syscalls. o Removed dead code. o Shitloads of other things I forgot ...
Diffstat (limited to 'drivers/sgi/char')
-rw-r--r--drivers/sgi/char/cons_newport.c7
-rw-r--r--drivers/sgi/char/graphics.c7
-rw-r--r--drivers/sgi/char/sgiserial.c5
-rw-r--r--drivers/sgi/char/streamable.c6
-rw-r--r--drivers/sgi/char/usema.c8
5 files changed, 17 insertions, 16 deletions
diff --git a/drivers/sgi/char/cons_newport.c b/drivers/sgi/char/cons_newport.c
index b8a7f958d..b49ba172b 100644
--- a/drivers/sgi/char/cons_newport.c
+++ b/drivers/sgi/char/cons_newport.c
@@ -3,9 +3,9 @@
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: cons_newport.c,v 1.7 1998/03/03 01:23:05 ralf Exp $
+ * $Id: cons_newport.c,v 1.8 1998/03/03 16:57:28 ralf Exp $
*/
-
+#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/sched.h>
@@ -573,8 +573,7 @@ struct graphics_ops newport_graphic_ops = {
newport_reset, newport_ioctl /* g_reset_console, g_ioctl */
};
-struct graphics_ops *
-newport_probe (int slot, const char **name)
+__initfunc(struct graphics_ops * newport_probe (int slot, const char **name))
{
struct newport_regs *p;
diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c
index 663d124fa..3f9a80d14 100644
--- a/drivers/sgi/char/graphics.c
+++ b/drivers/sgi/char/graphics.c
@@ -22,6 +22,7 @@
* the reasons behind them.
*/
#include <linux/fs.h>
+#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@ -292,15 +293,13 @@ static struct miscdevice dev_opengl = {
};
/* This is called later from the misc-init routine */
-void
-gfx_register (void)
+__initfunc(void gfx_register (void))
{
misc_register (&dev_graphics);
misc_register (&dev_opengl);
}
-void
-gfx_init (const char **name)
+__initfunc(void gfx_init (const char **name))
{
struct console_ops *console;
struct graphics_ops *g;
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c
index e377d3241..12176d6d2 100644
--- a/drivers/sgi/char/sgiserial.c
+++ b/drivers/sgi/char/sgiserial.c
@@ -1,6 +1,9 @@
-/* sgiserial.c: Serial port driver for SGI machines.
+/*
+ * sgiserial.c: Serial port driver for SGI machines.
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ *
+ * $Id$
*/
#include <linux/config.h> /* for CONFIG_REMOTE_DEBUG */
diff --git a/drivers/sgi/char/streamable.c b/drivers/sgi/char/streamable.c
index f26aad0e2..02129fde4 100644
--- a/drivers/sgi/char/streamable.c
+++ b/drivers/sgi/char/streamable.c
@@ -5,9 +5,10 @@
* Major 10 is the streams clone device. The IRIX Xsgi server just
* opens /dev/gfx and closes it inmediately.
*
+ * $Id$
*/
-
#include <linux/fs.h>
+#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/sched.h>
#include <linux/kbd_kern.h>
@@ -351,8 +352,7 @@ static struct miscdevice dev_input_mouse = {
SGI_STREAMS_KEYBOARD, "streams-mouse", &sgi_mouse_fops
};
-void
-streamable_init (void)
+__initfunc(void streamable_init (void))
{
printk ("streamable misc devices registered (keyb:%d, gfx:%d)\n",
SGI_STREAMS_KEYBOARD, SGI_GFX_MINOR);
diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c
index dfef772eb..83a26a717 100644
--- a/drivers/sgi/char/usema.c
+++ b/drivers/sgi/char/usema.c
@@ -20,9 +20,10 @@
* usema(7m), usinit(3p), usnewsema(3p)
* /usr/include/sys/usioctl.h
*
-*/
-
+ * $Id$
+ */
#include <linux/fs.h>
+#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/sched.h>
#include <linux/file.h>
@@ -186,8 +187,7 @@ static struct miscdevice dev_usemaclone = {
SGI_USEMACLONE, "usemaclone", &sgi_usemaclone_fops
};
-void
-usema_init(void)
+__initfunc(void usema_init(void))
{
printk("usemaclone misc device registered (minor: %d)\n",
SGI_USEMACLONE);