Subject: [PATCH] fix compile warning in rivafb on ppc
From: Christoph Hellwig <[email-masked]>
To: [email-masked]
Date: Wed, 1 Sep 2004 14:26:50 +0200

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;