Commit 37257fe8 authored by Ciaran McCreesh's avatar Ciaran McCreesh Committed by Keith M. Wesolowski

[SPARC64]: Fix CONFIG_DRM_FFB=y build.

parent ba628267
...@@ -372,25 +372,6 @@ static int ffb_presetup(drm_device_t *dev) ...@@ -372,25 +372,6 @@ static int ffb_presetup(drm_device_t *dev)
return ret; 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_fops.h"
#include "drm_init.h" #include "drm_init.h"
#include "drm_ioctl.h" #include "drm_ioctl.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment