From 742c33bf6197e6ed18c7de89c7d895fecafaa838 Mon Sep 17 00:00:00 2001
From: Rik Faith <faith@alephnull.com>
Date: Thu, 20 Jul 2000 00:59:40 +0000
Subject: [PATCH] Fix signature for *_options function

---
 linux-core/i810_drv.c | 2 +-
 linux-core/mga_drv.c  | 2 +-
 linux-core/r128_drv.c | 2 +-
 linux-core/tdfx_drv.c | 2 +-
 linux/gamma_drv.c     | 4 ++--
 linux/i810_drv.c      | 2 +-
 linux/mga_drv.c       | 2 +-
 linux/r128_drv.c      | 2 +-
 linux/tdfx_drv.c      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index 0067785c..c01008ef 100644
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -139,7 +139,7 @@ module_exit(i810_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init i810_options(char *str, int *ints)
+static int __init i810_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index 3e486d8f..75f14bee 100644
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -138,7 +138,7 @@ module_exit(mga_cleanup);
  * drm_parse_drm.
  */
 
-static int __init mga_options(char *str, int *ints)
+static int __init mga_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 1103832c..125de17d 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -134,7 +134,7 @@ module_exit(r128_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init r128_options(char *str, int *ints)
+static int __init r128_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index f102757b..b8e2ec30 100644
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -122,7 +122,7 @@ module_exit(tdfx_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init tdfx_options(char *str, int *ints)
+static int __init tdfx_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index 0586b4cf..cfe20ad8 100644
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -111,8 +111,8 @@ static drm_ioctl_desc_t	      gamma_ioctls[] = {
 
 #ifdef MODULE
 static char		      *gamma = NULL;
-static int 		      devices = 0;
 #endif
+static int 		      devices = 0;
 
 MODULE_AUTHOR("VA Linux Systems, Inc.");
 MODULE_DESCRIPTION("3dlabs GMX 2000");
@@ -131,7 +131,7 @@ module_exit(gamma_cleanup);
  */
  
 
-static int __init gamma_options(char *str, int *ints)
+static int __init gamma_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index 0067785c..c01008ef 100644
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -139,7 +139,7 @@ module_exit(i810_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init i810_options(char *str, int *ints)
+static int __init i810_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux/mga_drv.c b/linux/mga_drv.c
index 3e486d8f..75f14bee 100644
--- a/linux/mga_drv.c
+++ b/linux/mga_drv.c
@@ -138,7 +138,7 @@ module_exit(mga_cleanup);
  * drm_parse_drm.
  */
 
-static int __init mga_options(char *str, int *ints)
+static int __init mga_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 1103832c..125de17d 100644
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -134,7 +134,7 @@ module_exit(r128_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init r128_options(char *str, int *ints)
+static int __init r128_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index f102757b..b8e2ec30 100644
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -122,7 +122,7 @@ module_exit(tdfx_cleanup);
  * routine, drm_parse_drm.
  */
 
-static int __init tdfx_options(char *str, int *ints)
+static int __init tdfx_options(char *str)
 {
 	drm_parse_options(str);
 	return 1;