2.4.23-rc4 sparc64 compile problem: drivers/char/drm/ffb_drv.c
Compiling ffb_drv.c into the kernel (CONFIG_DRM_FFB=y) fails with ffb_drv.c:386: error: redefinition of ffb_options' drm_drv.h:138: error: ffb_options' previously defined here
Compiling it as a module (CONFIG_DRM_FFB=m) works fine.
I think this was introduced by
ChangeSet 1.1063.39.5 2003/09/01 17:05:39 [email protected]
[PATCH] Update DRI/DRM so XFree v4.3.0 and above works
when all drivers in drivers/char/drm/ except ffb*.* were modified.
Removing DRM(options) (that generates ffb_options) from ffb_drv.c makes it compile again. But ffb still needs the cleanup performed on the other drivers and possibly XFree 4.3 fixes.
Andreas
Please CC: me in your replys, as I'm not subscribed to lkml.
Quoted 5 lines · On Tue, 25 Nov 2003 16:51:58 +0100 Andreas Beckmann <[email protected]>…
Compiling
ffb_drv.cinto the kernel (CONFIG_DRM_FFB=y) fails with ffb_drv.c:386: error: redefinition offfb_options' drm_drv.h:138: error:ffb_options' previously defined hereCompiling it as a module (
CONFIG_DRM_FFB=m) works fine.
Not hard to fix, I'll toss this to Marcelo when he starts up 2.4.24-pre1
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1195 -> 1.1196
# drivers/char/drm/ffb_drv.c 1.9 -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/26 [email protected] 1.1196
# [SPARC64]: Fix non-modular build of FFB drm driver.
# --------------------------------------------
#
drivers/char/drm/ffb_drv.c +0 -19
@@ -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"