linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Oberritter <obi@saftware.de>
To: linuxppc-dev list <linuxppc-dev@lists.linuxppc.org>
Subject: [PATCH] fix bad merge in drivers/video/Config.in (linuxppc-2.4)
Date: Mon, 13 Oct 2003 20:52:32 +0200	[thread overview]
Message-ID: <1066071151.1582.2.camel@shiva.eth.saftware.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

Hi,

menuconfig didn't work anymore because of invalid syntax in Config.in.
Please apply.

Regards,
Andreas

[-- Attachment #2: video_config.diff --]
[-- Type: text/plain, Size: 588 bytes --]

===== drivers/video/Config.in 1.34 vs edited =====
--- 1.34/drivers/video/Config.in	Tue Sep 16 07:20:21 2003
+++ edited/drivers/video/Config.in	Mon Oct 13 20:48:45 2003
@@ -425,7 +425,7 @@
 	      "$CONFIG_FB_INTEL" = "m" -o \
 	      "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
 	      "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
-	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "m" ]; then
+	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "m" -o \
 	      "$CONFIG_FB_XILINX" = "m" ]; then
 	    define_tristate CONFIG_FBCON_CFB32 m
 	 fi

                 reply	other threads:[~2003-10-13 18:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1066071151.1582.2.camel@shiva.eth.saftware.de \
    --to=obi@saftware.de \
    --cc=linuxppc-dev@lists.linuxppc.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).