commit e764a20196f4e1b497a42fdc6e9d254e7ec290f2
author Jean Delvare <khali@linux-fr.org> Mon Nov 07 01:00:34 2005 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Nov 07 07:53:49 2005 -0800
tree daa5d3c6d386a201ba1660d73a0f4875dd3f75cd
parent 3a59026ba111d85b1a86af0f1c4e5a8ef1242d82

[PATCH] radeonfb: prevent spurious recompilations

Prevent spurious recompilations of the radeonfb driver when I2C/DDC support
is not included and i2c header files are modified.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/video/aty/radeon_base.c

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 8a24a66..7ef4b90 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -69,7 +69,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/device.h>
-#include <linux/i2c.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/video/aty/radeonfb.h

diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 01b8b2f..217e00a 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -10,9 +10,10 @@
 #include <linux/fb.h>
 
 
+#ifdef CONFIG_FB_RADEON_I2C
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
+#endif
 
 #include <asm/io.h>