[PATCH] fix compile warning in rivafb on ppc

riva_get_EDID_i2c is only used on !CONFIG_PPC_OF, so don't compile it on
ppc either.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 2ab1175532ba3d7e333d146128d2e4c4576f7e20..8ba8e36845d8dbfdaa637c5d1c44820bf36ca70b 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1713,7 +1713,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
 }
 #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;