From 84a5e7108773d5a5ff7242e1460c98e3acb178a8 Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Mon, 23 Jul 2001 20:25:38 +0000 Subject: Fixes that allow the modules to be built into the kernel --- linux-core/tdfx_drv.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'linux-core/tdfx_drv.c') diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index f478395f..b6c95498 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -51,6 +51,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 tdfx_options( char *str ) +{ + DRM(parse_options)( str ); + return 1; +} + +__setup( DRIVER_NAME "=", tdfx_options ); +#endif + #include "drm_fops.h" #include "drm_init.h" #include "drm_ioctl.h" -- cgit v1.2.3