summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonino Daplas <adaplas@hotpop.com>2004-10-28 23:24:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-28 23:24:38 -0700
commit5b88fa22403b61512f76e0bc01ac3a66c44ffd24 (patch)
tree75e7e65f4696d332862e9a7df67797d94b2a8c24
parent7854a48319140b4ecb680d0826207d7ee4a8f9d9 (diff)
[PATCH] fbdev: Convert MODULE_PARM to module_param in intelfb
fbdev: Convert MODULE_PARM to module_param in intelfb Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/intelfb/intelfb.h6
-rw-r--r--drivers/video/intelfb/intelfbdrv.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index d5016a17bc2f..3e4854fe56f9 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -97,12 +97,12 @@
/* module parameters */
#define INTELFB_INT_PARAM(name, default, desc) \
static int name = default; \
- MODULE_PARM(name, "i"); \
+ module_param(name, int, default); \
MODULE_PARM_DESC(name, desc);
#define INTELFB_STR_PARAM(name, default, desc) \
- static const char *name = default; \
- MODULE_PARM(name, "s"); \
+ static char *name = (char *) default; \
+ module_param(name, charp, default); \
MODULE_PARM_DESC(name, desc);
/* misc macros */
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e9e8219ddcb5..f0a863492c80 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -197,7 +197,7 @@ INTELFB_INT_PARAM(probeonly, 0, "Do a minimal probe (debug)");
INTELFB_INT_PARAM(idonly, 0,
"Just identify without doing anything else (debug)");
INTELFB_INT_PARAM(bailearly, 0, "Bail out early, depending on value (debug)");
-INTELFB_STR_PARAM(mode, NULL,
+INTELFB_STR_PARAM(mode, 0,
"Initial video mode \"<xres>x<yres>[-<depth>][@<refresh>]\"");
/***************************************************************
* modules entry points *