diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/geode/display_gx.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/geode/display_gx.c')
| -rw-r--r-- | drivers/video/geode/display_gx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c index e759895bf3d3..f0af911a096d 100644 --- a/drivers/video/geode/display_gx.c +++ b/drivers/video/geode/display_gx.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | #include <asm/div64.h> | 18 | #include <asm/div64.h> |
| 19 | #include <asm/delay.h> | 19 | #include <asm/delay.h> |
| 20 | #include <asm/geode.h> | 20 | #include <linux/cs5535.h> |
| 21 | 21 | ||
| 22 | #include "gxfb.h" | 22 | #include "gxfb.h" |
| 23 | 23 | ||
| @@ -25,7 +25,7 @@ unsigned int gx_frame_buffer_size(void) | |||
| 25 | { | 25 | { |
| 26 | unsigned int val; | 26 | unsigned int val; |
| 27 | 27 | ||
| 28 | if (!geode_has_vsa2()) { | 28 | if (!cs5535_has_vsa2()) { |
| 29 | uint32_t hi, lo; | 29 | uint32_t hi, lo; |
| 30 | 30 | ||
| 31 | /* The number of pages is (PMAX - PMIN)+1 */ | 31 | /* The number of pages is (PMAX - PMIN)+1 */ |