Remove what looks like a redundant ffb_options in ffb_drv.c

PATCH New Tugrul Galatali 1 participant 1 message Jul 27, 2003 Char and misc drivers

Share & tools

Tugrul Galatali

author

2003-07-27 23:22 UTC #0 lore raw

PATCH 1/1 Remove what looks like a redundant ffb_options in ffb_drv.c

Decided to try building stock 2.6.0-test2 on an Ultra 60 sitting here,
and ran into a redefinition of ffb_options between ffb_drv.c and drm_drv.h. The one in ffb_drv.c looks redundant to me, and after removing it I was able to successfully compile and boot the resulting kernel.

Tugrul Galatali

drivers/char/drm/ffb_drv.c 2003-07-27 17:06:58.000000000 -0400 renamed from drivers/char/drm/ffb_drv.c.orig 2003-07-27 17:08:18.000000000 -0400 +0 ~~-19~~

diff -u linux-2.6.0-test2/drivers/char/drm/ffb_drv.c.orig linux-2.6.0-test2/drivers/char/drm/ffb_drv.c
@@ -372,25 +372,6 @@
        return ret;
 }
 
-#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 ffb_options(char *str)
-{
-       DRM(parse_options)(str);
-       return 1;
-}
-
-__setup(DRIVER_NAME "=", ffb_options);
-#endif
-
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"