diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-15 08:22:47 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-15 08:22:47 +0400 |
| commit | 7b918120489ea004388b7370194222671e657203 (patch) | |
| tree | edef07621f0b31cd39f491c9050ea8361d621372 /drivers/video/via/viafbdev.h | |
| parent | 5b270d7bcbba26297abc38a3af566acbcc672ac6 (diff) | |
| parent | 5dc5f61813a9c3ab7dd0a6982ad044834134db5a (diff) | |
| download | linux-7b918120489ea004388b7370194222671e657203.tar.xz | |
Merge branch 'viafb-aux' into viafb-next
Diffstat (limited to 'drivers/video/via/viafbdev.h')
| -rw-r--r-- | drivers/video/via/viafbdev.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index d9440635d1d4..f6b2ddf56e94 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h @@ -26,6 +26,7 @@ #include <linux/fb.h> #include <linux/spinlock.h> +#include "via_aux.h" #include "ioctl.h" #include "share.h" #include "chip.h" @@ -48,6 +49,11 @@ struct viafb_shared { struct proc_dir_entry *iga2_proc_entry; struct viafb_dev *vdev; /* Global dev info */ + /* I2C busses that may have auxiliary devices */ + struct via_aux_bus *i2c_26; + struct via_aux_bus *i2c_31; + struct via_aux_bus *i2c_2C; + /* All the information will be needed to set engine */ struct tmds_setting_information tmds_setting_info; struct lvds_setting_information lvds_setting_info; |