diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-11-07 04:00:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:49 -0500 |
commit | e764a20196f4e1b497a42fdc6e9d254e7ec290f2 (patch) | |
tree | daa5d3c6d386a201ba1660d73a0f4875dd3f75cd /drivers/video | |
parent | 3a59026ba111d85b1a86af0f1c4e5a8ef1242d82 (diff) |
[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>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 1 | ||||
-rw-r--r-- | drivers/video/aty/radeonfb.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 8a24a66d9ba8..7ef4b901b93e 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -69,7 +69,6 @@ | |||
69 | #include <linux/pci.h> | 69 | #include <linux/pci.h> |
70 | #include <linux/vmalloc.h> | 70 | #include <linux/vmalloc.h> |
71 | #include <linux/device.h> | 71 | #include <linux/device.h> |
72 | #include <linux/i2c.h> | ||
73 | 72 | ||
74 | #include <asm/io.h> | 73 | #include <asm/io.h> |
75 | #include <asm/uaccess.h> | 74 | #include <asm/uaccess.h> |
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index 01b8b2f78514..217e00ab4a2d 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
@@ -10,9 +10,10 @@ | |||
10 | #include <linux/fb.h> | 10 | #include <linux/fb.h> |
11 | 11 | ||
12 | 12 | ||
13 | #ifdef CONFIG_FB_RADEON_I2C | ||
13 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
14 | #include <linux/i2c-id.h> | ||
15 | #include <linux/i2c-algo-bit.h> | 15 | #include <linux/i2c-algo-bit.h> |
16 | #endif | ||
16 | 17 | ||
17 | #include <asm/io.h> | 18 | #include <asm/io.h> |
18 | 19 | ||