Re: 2.4.23-rc4 sparc64 compile problem: drivers/char/drm/ffb_drv.c

[David S. Miller]

On Tue, 25 Nov 2003 16:51:58 +0100
Andreas Beckmann <sparclinux@xxxxxxxxxxxx> wrote:

> 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.

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	davem@xxxxxxxxxxxxxx	1.1196
# [SPARC64]: Fix non-modular build of FFB drm driver.
# --------------------------------------------
#
diff -Nru a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
--- a/drivers/char/drm/ffb_drv.c	Wed Nov 26 23:32:08 2003
+++ b/drivers/char/drm/ffb_drv.c	Wed Nov 26 23:32:08 2003
@@ -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"
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/