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/lcd.h | |
| parent | bdab225015fbbb45ccd8913f5d7c01b2bf67d8b2 (diff) | |
| parent | 51f4332bb5fef869e8a89895a7bac6b4c03b4946 (diff) | |
| download | kernel_replicant_linux-9ae6d039224def926656206725ae6e89d1331417.tar.gz kernel_replicant_linux-9ae6d039224def926656206725ae6e89d1331417.tar.bz2 kernel_replicant_linux-9ae6d039224def926656206725ae6e89d1331417.zip | |
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/lcd.h')
| -rw-r--r-- | drivers/video/via/lcd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h index b348efc360b8..c7909fe29550 100644 --- a/drivers/video/via/lcd.h +++ b/drivers/video/via/lcd.h @@ -71,15 +71,15 @@ void viafb_enable_lvds_vt1636(struct lvds_setting_information struct lvds_chip_information *plvds_chip_info); void viafb_lcd_disable(void); void viafb_lcd_enable(void); -void viafb_init_lcd_size(void); -void viafb_init_lvds_output_interface(struct lvds_chip_information +void __devinit viafb_init_lcd_size(void); +void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information *plvds_chip_info, struct lvds_setting_information *plvds_setting_info); void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, struct lvds_setting_information *plvds_setting_info, struct lvds_chip_information *plvds_chip_info); -int viafb_lvds_trasmitter_identify(void); +int __devinit viafb_lvds_trasmitter_identify(void); void viafb_init_lvds_output_interface(struct lvds_chip_information *plvds_chip_info, struct lvds_setting_information |