diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 19:02:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 19:02:41 -0700 |
| commit | 9ae6d039224def926656206725ae6e89d1331417 (patch) | |
| tree | 8ebee863f61da7d095575ca7ef17812d3952389c /drivers/video/via/chip.h | |
| parent | bdab225015fbbb45ccd8913f5d7c01b2bf67d8b2 (diff) | |
| parent | 51f4332bb5fef869e8a89895a7bac6b4c03b4946 (diff) | |
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
* 'viafb-next' of git://github.com/schandinat/linux-2.6: (29 commits)
viafb: add initial VX900 support
viafb: fix hardware acceleration for suspend & resume
viafb: make suspend and resume work (on all machines?)
viafb: restore display on resume
Minimal support for viafb suspend/resume
viafb: use proper register for colour when doing fill ops
viafb: add documentation for proc interface
viafb: rename output devices
viafb: add a mapping of supported output devices
viafb: set sync polarity for all output devices
viafb: add function to change sync polarity per device
viafb: reduce I2C timeout and delay
viafb: enable I2C for CRT
viafb: fix i2c_transfer error handling
viafb: vt1636 cleanup
viafb: introduce per output device power management
viafb: limit LCD code impact
viafb: add interface for output device configuration
viafb: merge the remaining output path with enable functions
viafb: use new device routing
...
Diffstat (limited to 'drivers/video/via/chip.h')
| -rw-r--r-- | drivers/video/via/chip.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h index ef1f3de2e05..48f1342897b 100644 --- a/drivers/video/via/chip.h +++ b/drivers/video/via/chip.h @@ -71,6 +71,9 @@ #define UNICHROME_VX855 12 #define UNICHROME_VX855_DID 0x5122 +#define UNICHROME_VX900 13 +#define UNICHROME_VX900_DID 0x7122 + /**************************************************/ /* Definition TMDS Trasmitter Information */ /**************************************************/ |