Commit c2f6aa61 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b3335b04
...@@ -1713,7 +1713,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) ...@@ -1713,7 +1713,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
} }
#endif /* CONFIG_PPC_OF */ #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) static int __devinit riva_get_EDID_i2c(struct fb_info *info)
{ {
struct riva_par *par = (struct riva_par *) info->par; struct riva_par *par = (struct riva_par *) info->par;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment