diff options
author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2012-11-22 07:11:32 -0500 |
---|---|---|
committer | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-01-24 02:59:44 -0500 |
commit | ea4f3111ef0daffa1d11fded6f375227febca458 (patch) | |
tree | 4be2908bdb0ee68d5d7614d9cc2b01ed4fcf8be6 /drivers/video/via/via_modesetting.c | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) |
viafb: rename display_timing to via_display_timing
The struct display_timing is specific to the via subsystem. The naming leads to
collisions with the new struct display_timing, which is supposed to be a shared
struct between different subsystems.
To clean this up, prepend the existing struct with the subsystem it is specific
to.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Diffstat (limited to 'drivers/video/via/via_modesetting.c')
-rw-r--r-- | drivers/video/via/via_modesetting.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/via/via_modesetting.c b/drivers/video/via/via_modesetting.c index 0e431aee17bb..0b414b09b9b4 100644 --- a/drivers/video/via/via_modesetting.c +++ b/drivers/video/via/via_modesetting.c | |||
@@ -30,9 +30,9 @@ | |||
30 | #include "debug.h" | 30 | #include "debug.h" |
31 | 31 | ||
32 | 32 | ||
33 | void via_set_primary_timing(const struct display_timing *timing) | 33 | void via_set_primary_timing(const struct via_display_timing *timing) |
34 | { | 34 | { |
35 | struct display_timing raw; | 35 | struct via_display_timing raw; |
36 | 36 | ||
37 | raw.hor_total = timing->hor_total / 8 - 5; | 37 | raw.hor_total = timing->hor_total / 8 - 5; |
38 | raw.hor_addr = timing->hor_addr / 8 - 1; | 38 | raw.hor_addr = timing->hor_addr / 8 - 1; |
@@ -88,9 +88,9 @@ void via_set_primary_timing(const struct display_timing *timing) | |||
88 | via_write_reg_mask(VIACR, 0x17, 0x80, 0x80); | 88 | via_write_reg_mask(VIACR, 0x17, 0x80, 0x80); |
89 | } | 89 | } |
90 | 90 | ||
91 | void via_set_secondary_timing(const struct display_timing *timing) | 91 | void via_set_secondary_timing(const struct via_display_timing *timing) |
92 | { | 92 | { |
93 | struct display_timing raw; | 93 | struct via_display_timing raw; |
94 | 94 | ||
95 | raw.hor_total = timing->hor_total - 1; | 95 | raw.hor_total = timing->hor_total - 1; |
96 | raw.hor_addr = timing->hor_addr - 1; | 96 | raw.hor_addr = timing->hor_addr - 1; |