LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "David S. Miller" <davem@redhat.com>
To: Andreas Beckmann <sparclinux@abeckmann.de>
Cc: linux-kernel@vger.kernel.org, sparclinux@abeckmann.de
Subject: Re: 2.4.23-rc4 sparc64 compile problem: drivers/char/drm/ffb_drv.c
Date: Wed, 26 Nov 2003 23:36:07 -0800	[thread overview]
Message-ID: <20031126233607.7d781cc9.davem@redhat.com> (raw)
In-Reply-To: <3FC37A9E.6030002@abeckmann.de>

On Tue, 25 Nov 2003 16:51:58 +0100
Andreas Beckmann <sparclinux@abeckmann.de> 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@nuts.ninka.net	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"

      reply	other threads:[~2003-11-27  7:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-25 15:51 Andreas Beckmann
2003-11-27  7:36 ` David S. Miller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20031126233607.7d781cc9.davem@redhat.com \
    --to=davem@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sparclinux@abeckmann.de \
    --subject='Re: 2.4.23-rc4 sparc64 compile problem: drivers/char/drm/ffb_drv.c' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).