aboutsummaryrefslogtreecommitdiff
path: root/linux-core/r128_drv.c
diff options
context:
space:
mode:
authorJeff Hartmann <jhartmann@valinux.com>2001-07-23 20:25:38 +0000
committerJeff Hartmann <jhartmann@valinux.com>2001-07-23 20:25:38 +0000
commit84a5e7108773d5a5ff7242e1460c98e3acb178a8 (patch)
tree62e3c17333ae2779706f5b9823a3be9c1de9de9d /linux-core/r128_drv.c
parent5e8ba79eb6aabd85f52de43fcf30722268857f60 (diff)
Fixes that allow the modules to be built into the kernel
Diffstat (limited to 'linux-core/r128_drv.c')
-rw-r--r--linux-core/r128_drv.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 2fdcb158..4f0bb92b 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -81,6 +81,26 @@
#include "drm_dma.h"
#include "drm_drawable.h"
#include "drm_drv.h"
+
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO). It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp. If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init r128_options( char *str )
+{
+ DRM(parse_options)( str );
+ return 1;
+}
+
+__setup( DRIVER_NAME "=", r128_options );
+#endif
+
#include "drm_fops.h"
#include "drm_init.h"
#include "drm_ioctl.h"