diff options
author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2002-07-05 08:31:11 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2002-07-05 08:31:11 +0000 |
commit | 74ef13fd009b9e37956e4207d0a5ed92f4b5e39a (patch) | |
tree | d4fa32d8f9b23872218ca5283cbd9b5fe02f6600 /linux/tdfx_drv.c | |
parent | 24025ca5f78c15ced14490532b4410730353d2c1 (diff) |
merged bsd-3-0-0-branchbsd-3-0-0-20020705-merge
Diffstat (limited to 'linux/tdfx_drv.c')
-rw-r--r-- | linux/tdfx_drv.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c index 91499077..8b790188 100644 --- a/linux/tdfx_drv.c +++ b/linux/tdfx_drv.c @@ -82,25 +82,6 @@ static drm_pci_list_t DRM(idlist)[] = { #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" |