Return-Path: Received: from localhost (bix [127.0.0.1]) by localhost.localdomain (8.12.10/8.12.10) with ESMTP id i81CQGAp021615 for ; Wed, 1 Sep 2004 05:26:16 -0700 Received: from bix [127.0.0.1] by localhost with POP3 (fetchmail-6.2.0) for akpm@localhost (single-drop); Wed, 01 Sep 2004 05:26:16 -0700 (PDT) Received: from fire-1.osdl.org (fire.osdl.org [65.172.181.4]) by mail.osdl.org (8.11.6/8.11.6) with ESMTP id i81CQs125753 for ; Wed, 1 Sep 2004 05:26:54 -0700 Received: from mail.lst.de (verein.lst.de [213.95.11.210]) by fire-1.osdl.org (8.12.8/8.12.8) with ESMTP id i81CQpSf008063 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 1 Sep 2004 05:26:53 -0700 Received: from verein.lst.de (localhost [127.0.0.1]) by mail.lst.de (8.12.3/8.12.3/Debian-6.6) with ESMTP id i81CQo95026132 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 1 Sep 2004 14:26:50 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-6.6) id i81CQogd026130 for akpm@osdl.org; Wed, 1 Sep 2004 14:26:50 +0200 Date: Wed, 1 Sep 2004 14:26:50 +0200 From: Christoph Hellwig To: akpm@osdl.org Subject: [PATCH] fix compile warning in rivafb on ppc Message-ID: <20040901122650.GA26113@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Spam-Score: -4.901 () BAYES_00 X-Scanned-By: MIMEDefang 2.36 X-MIMEDefang-Filter: osdl$Revision: 1.73 $ X-Spam-Status: No, hits=-4.9 required=1.0 tests=BAYES_00 autolearn=ham version=2.60 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on bix riva_get_EDID_i2c is only used on !CONFIG_PPC_OF, so don't compile it on ppc either. --- 1.66/drivers/video/riva/fbdev.c 2004-08-23 10:15:06 +02:00 +++ edited/drivers/video/riva/fbdev.c 2004-09-01 14:00:07 +02:00 @@ -1713,7 +1713,7 @@ } #endif /* CONFIG_PPC_OF */ -#ifdef CONFIG_FB_RIVA_I2C +#if defined(CONFIG_FB_RIVA_I2C) && !defined(CONFIG_PPC_OF) static int __devinit riva_get_EDID_i2c(struct fb_info *info) { struct riva_par *par = (struct riva_par *) info->par;