diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/video/i810/i810_main.h | |
| parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
| parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
| download | linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/video/i810/i810_main.h')
| -rw-r--r-- | drivers/video/i810/i810_main.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/video/i810/i810_main.h b/drivers/video/i810/i810_main.h index 43b4297b4d48..06072a6466f2 100644 --- a/drivers/video/i810/i810_main.h +++ b/drivers/video/i810/i810_main.h @@ -83,6 +83,22 @@ extern int i810fb_sync (struct fb_info *p); extern void i810fb_init_ringbuffer(struct fb_info *info); extern void i810fb_load_front (u32 offset, struct fb_info *info); +#ifdef CONFIG_FB_I810_I2C +/* I2C */ +extern int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, + int conn); +extern void i810_create_i2c_busses(struct i810fb_par *par); +extern void i810_delete_i2c_busses(struct i810fb_par *par); +#else +static inline int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, + int conn) +{ + return 1; +} +static inline void i810_create_i2c_busses(struct i810fb_par *par) { } +static inline void i810_delete_i2c_busses(struct i810fb_par *par) { } +#endif + /* Conditionals */ #ifdef CONFIG_X86 inline void flush_cache(void) |